aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Kalimdor
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2013-06-13 19:35:01 +0200
committerVincent-Michael <Vincent_Michael@gmx.de>2013-06-13 19:35:01 +0200
commit87d9d1d7055fdda84d8f116041224ce0fb289b02 (patch)
tree3534098d09befbb23c39cbf02a3256365d5bfc76 /src/server/scripts/Kalimdor
parent0bebf40fe7fc6ffdf3e86452f14e3bf647380b15 (diff)
parent1c9a3d562120039c9fe96d35a63ade8ee9cb1266 (diff)
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/AI/EventAI/CreatureEventAI.cpp src/server/game/Achievements/AchievementMgr.cpp src/server/game/Entities/Object/Object.cpp src/server/game/Entities/Pet/Pet.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Transport/Transport.cpp src/server/game/Entities/Unit/StatSystem.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Entities/Unit/Unit.h src/server/game/Handlers/BattleGroundHandler.cpp src/server/game/Handlers/ChatHandler.cpp src/server/game/Handlers/ItemHandler.cpp src/server/game/Handlers/NPCHandler.cpp src/server/game/Handlers/PetHandler.cpp src/server/game/Handlers/SpellHandler.cpp src/server/game/Instances/InstanceScript.cpp src/server/game/Spells/Auras/SpellAuraEffects.cpp src/server/game/Spells/SpellEffects.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp src/server/scripts/EasternKingdoms/boss_kruul.cpp src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp src/server/scripts/EasternKingdoms/zone_ghostlands.cpp src/server/scripts/EasternKingdoms/zone_ironforge.cpp src/server/scripts/EasternKingdoms/zone_loch_modan.cpp src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp src/server/scripts/Kalimdor/zone_azshara.cpp src/server/scripts/Kalimdor/zone_darkshore.cpp src/server/scripts/Kalimdor/zone_durotar.cpp src/server/scripts/Kalimdor/zone_felwood.cpp src/server/scripts/Kalimdor/zone_feralas.cpp src/server/scripts/Kalimdor/zone_orgrimmar.cpp src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp src/server/scripts/Kalimdor/zone_tanaris.cpp src/server/scripts/Kalimdor/zone_thousand_needles.cpp src/server/scripts/Kalimdor/zone_thunder_bluff.cpp src/server/scripts/Kalimdor/zone_ungoro_crater.cpp src/server/scripts/Northrend/zone_dalaran.cpp src/server/scripts/Spells/spell_pet.cpp src/server/scripts/Spells/spell_shaman.cpp
Diffstat (limited to 'src/server/scripts/Kalimdor')
-rw-r--r--src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp10
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp4
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp18
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp6
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp2
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp6
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp4
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp12
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp70
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp8
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp2
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp6
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp2
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp4
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp2
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp2
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp4
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp4
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp4
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp6
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp4
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp6
-rw-r--r--src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp8
-rw-r--r--src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp2
-rw-r--r--src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp10
-rw-r--r--src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp2
-rw-r--r--src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp8
-rw-r--r--src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp2
-rw-r--r--src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp2
-rw-r--r--src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp2
-rw-r--r--src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp2
-rw-r--r--src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp2
-rw-r--r--src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp6
-rw-r--r--src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp14
-rw-r--r--src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp16
-rw-r--r--src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp2
-rw-r--r--src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp6
-rw-r--r--src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp8
-rw-r--r--src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp10
-rw-r--r--src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp14
-rw-r--r--src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp4
-rw-r--r--src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp2
-rw-r--r--src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp6
-rw-r--r--src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp16
-rw-r--r--src/server/scripts/Kalimdor/boss_azuregos.cpp8
-rw-r--r--src/server/scripts/Kalimdor/zone_ashenvale.cpp4
-rw-r--r--src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp8
-rw-r--r--src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp12
-rw-r--r--src/server/scripts/Kalimdor/zone_moonglade.cpp6
-rw-r--r--src/server/scripts/Kalimdor/zone_mulgore.cpp4
-rw-r--r--src/server/scripts/Kalimdor/zone_silithus.cpp4
-rw-r--r--src/server/scripts/Kalimdor/zone_tanaris.cpp12
-rw-r--r--src/server/scripts/Kalimdor/zone_teldrassil.cpp2
-rw-r--r--src/server/scripts/Kalimdor/zone_the_barrens.cpp16
-rw-r--r--src/server/scripts/Kalimdor/zone_thunder_bluff.cpp8
-rw-r--r--src/server/scripts/Kalimdor/zone_winterspring.cpp4
56 files changed, 209 insertions, 209 deletions
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
index f4f7dc6a23e..81e1136f94f 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
@@ -82,7 +82,7 @@ public:
{
npc_blackfathom_deeps_eventAI(Creature* creature) : ScriptedAI(creature)
{
- if (creature->isSummon())
+ if (creature->IsSummon())
{
creature->SetHomePosition(HomePosition);
AttackPlayer();
@@ -117,12 +117,12 @@ public:
for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i)
{
- if (Player* player = i->getSource())
+ if (Player* player = i->GetSource())
{
- if (player->isGameMaster())
+ if (player->IsGameMaster())
continue;
- if (player->isAlive())
+ if (player->IsAlive())
{
me->SetInCombatWith(player);
player->SetInCombatWith(me);
@@ -183,7 +183,7 @@ public:
void JustDied(Unit* /*killer*/)
{
- if (me->isSummon()) //we are not a normal spawn.
+ if (me->IsSummon()) //we are not a normal spawn.
if (instance)
instance->SetData(DATA_EVENT, instance->GetData(DATA_EVENT) + 1);
}
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
index 6a697c3cc9c..f3bfe0b8fbe 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
@@ -93,7 +93,7 @@ public:
if (waypointId == 7 && instance)
{
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE));
- if (target && target->isAlive())
+ if (target && target->IsAlive())
me->AddThreat(target, 0.0f);
}
}
@@ -217,7 +217,7 @@ public:
void MoveInLineOfSight(Unit* who)
{
- if (me->IsWithinDist(who, 50) && !me->isInCombat() && me->IsValidAttackTarget(who))
+ if (me->IsWithinDist(who, 50) && !me->IsInCombat() && me->IsValidAttackTarget(who))
AttackStart(who);
}
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
index dcf9605f101..332ac33c56b 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
@@ -121,7 +121,7 @@ public:
{
if (Unit* Archimonde = Unit::GetUnit(*me, ArchimondeGUID))
{
- if (Archimonde->HealthBelowPct(2) || !Archimonde->isAlive())
+ if (Archimonde->HealthBelowPct(2) || !Archimonde->IsAlive())
DoCast(me, SPELL_DENOUEMENT_WISP);
else
DoCast(Archimonde, SPELL_ANCIENT_SPARK);
@@ -355,7 +355,7 @@ public:
bool CanUseFingerOfDeath()
{
// First we check if our current victim is in melee range or not.
- Unit* victim = me->getVictim();
+ Unit* victim = me->GetVictim();
if (victim && me->IsWithinDistInMap(victim, me->GetAttackDistance(victim)))
return false;
@@ -368,7 +368,7 @@ public:
for (; itr != threatlist.end(); ++itr)
{
Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid());
- if (unit && unit->isAlive())
+ if (unit && unit->IsAlive())
targets.push_back(unit);
}
@@ -382,7 +382,7 @@ public:
if (!me->IsWithinDistInMap(target, me->GetAttackDistance(target)))
return true; // Cast Finger of Death
else // This target is closest, he is our new tank
- me->AddThreat(target, me->getThreatManager().getThreat(me->getVictim()));
+ me->AddThreat(target, me->getThreatManager().getThreat(me->GetVictim()));
}
return false;
@@ -456,7 +456,7 @@ public:
if (me->HasAura(chargeSpell))
{
me->RemoveAuraFromStack(chargeSpell);
- DoCast(me->getVictim(), unleashSpell);
+ DoCast(me->GetVictim(), unleashSpell);
HasCast = true;
SoulChargeCount--;
}
@@ -467,7 +467,7 @@ public:
void UpdateAI(uint32 diff)
{
- if (!me->isInCombat())
+ if (!me->IsInCombat())
{
if (instance)
{
@@ -577,7 +577,7 @@ public:
{
if (HandOfDeathTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_HAND_OF_DEATH);
+ DoCast(me->GetVictim(), SPELL_HAND_OF_DEATH);
HandOfDeathTimer = 2000;
} else HandOfDeathTimer -= diff;
return; // Don't do anything after this point.
@@ -605,7 +605,7 @@ public:
if (FearTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_FEAR);
+ DoCast(me->GetVictim(), SPELL_FEAR);
FearTimer = 42000;
} else FearTimer -= diff;
@@ -614,7 +614,7 @@ public:
Talk(SAY_DOOMFIRE);
Unit* temp = SelectTarget(SELECT_TARGET_RANDOM, 1);
if (!temp)
- temp = me->getVictim();
+ temp = me->GetVictim();
//replace with spell cast 31903 once implicitTarget 73 implemented
SummonDoomfire(temp);
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
index 15470716ea7..f47ba2cc3a3 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
@@ -99,7 +99,7 @@ public:
if (waypointId == 7 && instance)
{
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL));
- if (target && target->isAlive())
+ if (target && target->IsAlive())
me->AddThreat(target, 0.0f);
}
}
@@ -161,7 +161,7 @@ public:
if (CleaveTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_CLEAVE);
+ DoCast(me->GetVictim(), SPELL_CLEAVE);
CleaveTimer = 10000+rand()%5000;
} else CleaveTimer -= diff;
@@ -226,7 +226,7 @@ public:
void MoveInLineOfSight(Unit* who)
{
- if (me->IsWithinDist(who, 50) && !me->isInCombat() && me->IsValidAttackTarget(who))
+ if (me->IsWithinDist(who, 50) && !me->IsInCombat() && me->IsValidAttackTarget(who))
AttackStart(who);
}
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
index 0780b3dcf0d..c24eda9b38e 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
@@ -95,7 +95,7 @@ public:
if (waypointId == 7 && instance)
{
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL));
- if (target && target->isAlive())
+ if (target && target->IsAlive())
me->AddThreat(target, 0.0f);
}
}
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 b35826c9d87..6d9a66c1a64 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
@@ -90,7 +90,7 @@ public:
if (waypointId == 7 && instance)
{
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE));
- if (target && target->isAlive())
+ if (target && target->IsAlive())
me->AddThreat(target, 0.0f);
}
}
@@ -139,13 +139,13 @@ public:
} else FrostArmorTimer -= diff;
if (DecayTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_DEATH_AND_DECAY);
+ DoCast(me->GetVictim(), SPELL_DEATH_AND_DECAY);
DecayTimer = 60000+rand()%20000;
Talk(SAY_DECAY);
} else DecayTimer -= diff;
if (NovaTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_FROST_NOVA);
+ DoCast(me->GetVictim(), SPELL_FROST_NOVA);
NovaTimer = 30000+rand()%15000;
Talk(SAY_NOVA);
} else NovaTimer -= diff;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
index 1544ceee857..8445b4fc6c0 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
@@ -93,7 +93,7 @@ public:
else if (RageEncounter == DONE && AnetheronEncounter == DONE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RETREAT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
- if (player->isGameMaster())
+ if (player->IsGameMaster())
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_ITEM_GM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(907, creature->GetGUID());
@@ -175,7 +175,7 @@ public:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RETREAT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
}
- if (player->isGameMaster())
+ if (player->IsGameMaster())
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_ITEM_GM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(907, creature->GetGUID());
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
index a624cd4a4f7..50351aedb5f 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
@@ -421,7 +421,7 @@ void hyjalAI::EnterEvadeMode()
me->CombatStop(true);
me->LoadCreaturesAddon();
- if (me->isAlive())
+ if (me->IsAlive())
me->GetMotionMaster()->MoveTargetedHome();
me->SetLootRecipient(NULL);
@@ -825,7 +825,7 @@ void hyjalAI::UpdateAI(uint32 diff)
if (BossGUID[i])
{
Unit* unit = Unit::GetUnit(*me, BossGUID[i]);
- if (unit && (!unit->isAlive()))
+ if (unit && (!unit->IsAlive()))
{
if (BossGUID[i] == BossGUID[0])
{
@@ -874,11 +874,11 @@ void hyjalAI::UpdateAI(uint32 diff)
break;
case TARGETTYPE_VICTIM:
- target = me->getVictim();
+ target = me->GetVictim();
break;
}
- if (target && target->isAlive())
+ if (target && target->IsAlive())
{
DoCast(target, Spells[i].SpellId);
SpellTimer[i] = Spells[i].Cooldown;
@@ -988,7 +988,7 @@ void hyjalAI::WaypointReached(uint32 waypointId)
{
for (std::list<Creature*>::const_iterator itr = creatures.begin(); itr != creatures.end(); ++itr)
{
- if ((*itr) && (*itr)->isAlive() && (*itr) != me && (*itr)->GetEntry() != JAINA)
+ if ((*itr) && (*itr)->IsAlive() && (*itr) != me && (*itr)->GetEntry() != JAINA)
{
if (!(*itr)->IsWithinDist(me, 60))
(*itr)->SetWalk(false);
@@ -1028,7 +1028,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
{
for (std::list<Creature*>::const_iterator itr = creatures.begin(); itr != creatures.end(); ++itr)
{
- if ((*itr) && (*itr)->isAlive())
+ if ((*itr) && (*itr)->IsAlive())
{
(*itr)->CastSpell(*itr, SPELL_TELEPORT_VISUAL, true);
(*itr)->setFaction(35);//make them friendly so mobs won't attack them
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
index 87a09749724..9796614d2f2 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
@@ -191,7 +191,7 @@ hyjal_trashAI::hyjal_trashAI(Creature* creature) : npc_escortAI(creature)
void hyjal_trashAI::DamageTaken(Unit* done_by, uint32 &damage)
{
- if (done_by->GetTypeId() == TYPEID_PLAYER || done_by->isPet())
+ if (done_by->GetTypeId() == TYPEID_PLAYER || done_by->IsPet())
{
damageTaken += damage;
if (instance)
@@ -452,7 +452,7 @@ public:
if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall
{
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL));
- if (target && target->isAlive())
+ if (target && target->IsAlive())
me->AddThreat(target, 0.0f);
}
}
@@ -493,7 +493,7 @@ public:
if (instance->GetData(DATA_ALLIANCE_RETREAT) && !instance->GetData(DATA_HORDE_RETREAT))
{
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL));
- if (target && target->isAlive())
+ if (target && target->IsAlive())
me->AddThreat(target, 0.0f);
} else if (instance->GetData(DATA_ALLIANCE_RETREAT) && instance->GetData(DATA_HORDE_RETREAT)){
//do overrun
@@ -528,7 +528,7 @@ public:
}
if (FlameBuffetTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_FLAME_BUFFET, true);
+ DoCast(me->GetVictim(), SPELL_FLAME_BUFFET, true);
FlameBuffetTimer = 7000;
} else FlameBuffetTimer -= diff;
DoMeleeAttackIfReady();
@@ -574,13 +574,13 @@ public:
if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall
{
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL));
- if (target && target->isAlive())
+ if (target && target->IsAlive())
me->AddThreat(target, 0.0f);
}
else
{
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE));
- if (target && target->isAlive())
+ if (target && target->IsAlive())
me->AddThreat(target, 0.0f);
}
}
@@ -630,7 +630,7 @@ public:
return;
if (KnockDownTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_KNOCKDOWN);
+ DoCast(me->GetVictim(), SPELL_KNOCKDOWN);
KnockDownTimer = 15000+rand()%10000;
} else KnockDownTimer -= diff;
DoMeleeAttackIfReady();
@@ -676,13 +676,13 @@ public:
if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall
{
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL));
- if (target && target->isAlive())
+ if (target && target->IsAlive())
me->AddThreat(target, 0.0f);
}
else
{
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE));
- if (target && target->isAlive())
+ if (target && target->IsAlive())
me->AddThreat(target, 0.0f);
}
}
@@ -790,13 +790,13 @@ public:
if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall
{
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL));
- if (target && target->isAlive())
+ if (target && target->IsAlive())
me->AddThreat(target, 0.0f);
}
else
{
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE));
- if (target && target->isAlive())
+ if (target && target->IsAlive())
me->AddThreat(target, 0.0f);
}
}
@@ -858,7 +858,7 @@ public:
if (ShadowBoltTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_SHADOW_BOLT);
+ DoCast(me->GetVictim(), SPELL_SHADOW_BOLT);
ShadowBoltTimer = 20000+rand()%10000;
} else ShadowBoltTimer -= diff;
@@ -906,13 +906,13 @@ public:
if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall
{
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL));
- if (target && target->isAlive())
+ if (target && target->IsAlive())
me->AddThreat(target, 0.0f);
}
else
{
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE));
- if (target && target->isAlive())
+ if (target && target->IsAlive())
me->AddThreat(target, 0.0f);
}
}
@@ -952,12 +952,12 @@ public:
return;
if (CourseTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_BANSHEE_CURSE);
+ DoCast(me->GetVictim(), SPELL_BANSHEE_CURSE);
CourseTimer = 20000+rand()%5000;
} else CourseTimer -= diff;
if (WailTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_BANSHEE_WAIL);
+ DoCast(me->GetVictim(), SPELL_BANSHEE_WAIL);
WailTimer = 15000+rand()%5000;
} else WailTimer -= diff;
if (ShellTimer <= diff)
@@ -1005,13 +1005,13 @@ public:
if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall
{
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL));
- if (target && target->isAlive())
+ if (target && target->IsAlive())
me->AddThreat(target, 0.0f);
}
else
{
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE));
- if (target && target->isAlive())
+ if (target && target->IsAlive())
me->AddThreat(target, 0.0f);
}
}
@@ -1052,7 +1052,7 @@ public:
return;
if (WebTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_WEB);
+ DoCast(me->GetVictim(), SPELL_WEB);
WebTimer = 20000+rand()%5000;
} else WebTimer -= diff;
DoMeleeAttackIfReady();
@@ -1095,13 +1095,13 @@ public:
if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall
{
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL));
- if (target && target->isAlive())
+ if (target && target->IsAlive())
me->AddThreat(target, 0.0f);
}
else
{
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE));
- if (target && target->isAlive())
+ if (target && target->IsAlive())
me->AddThreat(target, 0.0f);
}
}
@@ -1142,7 +1142,7 @@ public:
return;
if (ManaBurnTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_MANA_BURN);
+ DoCast(me->GetVictim(), SPELL_MANA_BURN);
ManaBurnTimer = 9000+rand()%5000;
} else ManaBurnTimer -= diff;
DoMeleeAttackIfReady();
@@ -1186,7 +1186,7 @@ public:
if (waypointId == 2 && instance && !IsOverrun)
{
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL));
- if (target && target->isAlive())
+ if (target && target->IsAlive())
{
me->AddThreat(target, 0.0f);
DoCast(target, SPELL_FROST_BREATH, true);
@@ -1240,19 +1240,19 @@ public:
}
if (!UpdateVictim())
return;
- if (!me->IsWithinDist(me->getVictim(), 25)){
+ if (!me->IsWithinDist(me->GetVictim(), 25)){
if (MoveTimer <= diff)
{
- me->GetMotionMaster()->MoveChase(me->getVictim());
+ me->GetMotionMaster()->MoveChase(me->GetVictim());
MoveTimer = 2000;
} else MoveTimer-=diff;
}
if (FrostBreathTimer <= diff)
{
- if (!me->IsWithinDist(me->getVictim(), 25))
+ if (!me->IsWithinDist(me->GetVictim(), 25))
{
- DoCast(me->getVictim(), SPELL_FROST_BREATH);
+ DoCast(me->GetVictim(), SPELL_FROST_BREATH);
me->StopMoving();
me->GetMotionMaster()->Clear();
FrostBreathTimer = 4000;
@@ -1303,7 +1303,7 @@ public:
if (waypointId == 2 && instance && !IsOverrun)
{
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL));
- if (target && target->isAlive())
+ if (target && target->IsAlive())
{
me->AddThreat(target, 0.0f);
DoCast(target, SPELL_GARGOYLE_STRIKE, true);
@@ -1364,7 +1364,7 @@ public:
}
if (!UpdateVictim())
return;
- if (!me->IsWithinDist(me->getVictim(), 20) || forcemove)
+ if (!me->IsWithinDist(me->GetVictim(), 20) || forcemove)
{
forcemove = false;
if (forcemove)
@@ -1375,7 +1375,7 @@ public:
if (MoveTimer <= diff)
{
float x, y, z;
- me->getVictim()->GetPosition(x, y, z);
+ me->GetVictim()->GetPosition(x, y, z);
me->GetMotionMaster()->MovePoint(0, x, y, z+Zpos);
Zpos -= 1.0f;
if (Zpos <= 0)
@@ -1385,9 +1385,9 @@ public:
}
if (StrikeTimer <= diff)
{
- if (me->IsWithinDist(me->getVictim(), 20))
+ if (me->IsWithinDist(me->GetVictim(), 20))
{
- DoCast(me->getVictim(), SPELL_GARGOYLE_STRIKE);
+ DoCast(me->GetVictim(), SPELL_GARGOYLE_STRIKE);
me->StopMoving();
me->GetMotionMaster()->Clear();
StrikeTimer = 2000+rand()%1000;
@@ -1428,7 +1428,7 @@ public:
void MoveInLineOfSight(Unit* who)
{
- if (!who || me->getVictim())
+ if (!who || me->GetVictim())
return;
if (me->IsValidAttackTarget(who))
@@ -1450,13 +1450,13 @@ public:
return;
if (ExplodeTimer <= diff)
{
- if (!me->IsWithinDistInMap(me->getVictim(), 30))
+ if (!me->IsWithinDistInMap(me->GetVictim(), 30))
{
EnterEvadeMode();
return;
}
int dmg = 500+rand()%700;
- me->CastCustomSpell(me->getVictim(), SPELL_EXPLODING_SHOT, &dmg, 0, 0, false);
+ me->CastCustomSpell(me->GetVictim(), SPELL_EXPLODING_SHOT, &dmg, 0, 0, false);
ExplodeTimer = 5000+rand()%5000;
} else ExplodeTimer -= diff;
DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
index 002ddda549d..4ca583e7831 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
@@ -215,16 +215,16 @@ public:
for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
{
- if (i->getSource())
+ if (i->GetSource())
{
WorldPacket packet(SMSG_MESSAGECHAT, 200);
- unit->BuildMonsterChat(&packet, CHAT_MSG_MONSTER_YELL, YELL_EFFORTS, 0, YELL_EFFORTS_NAME, i->getSource()->GetGUID());
- i->getSource()->GetSession()->SendPacket(&packet);
+ unit->BuildMonsterChat(&packet, CHAT_MSG_MONSTER_YELL, YELL_EFFORTS, 0, YELL_EFFORTS_NAME, i->GetSource()->GetGUID());
+ i->GetSource()->GetSession()->SendPacket(&packet);
WorldPacket data2(SMSG_PLAY_SOUND, 4);
data2 << uint32(10986);
data2 << uint64(unit->GetGUID());
- i->getSource()->GetSession()->SendPacket(&data2);
+ i->GetSource()->GetSession()->SendPacket(&data2);
}
}
}
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
index cda2175a22d..f404e1b242d 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
@@ -105,7 +105,7 @@ public:
//Curse of twisted flesh timer
if (uiCurseFleshTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_CURSE_OF_TWISTED_FLESH);
+ DoCast(me->GetVictim(), SPELL_CURSE_OF_TWISTED_FLESH);
uiCurseFleshTimer = 37000;
} else uiCurseFleshTimer -= diff;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
index d8df5d56888..dfaec601b58 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
@@ -1069,7 +1069,7 @@ public:
case 72:
case 74:
case 76:
- if (me->isInCombat())
+ if (me->IsInCombat())
phaseTimer = 1000;
else
{
@@ -1083,7 +1083,7 @@ public:
}
break;
case 78:
- if (me->isInCombat())
+ if (me->IsInCombat())
phaseTimer = 1000;
else
{
@@ -1214,7 +1214,7 @@ public:
}
//Battling skills
- if (!me->getVictim())
+ if (!me->GetVictim())
return;
if (exorcismTimer < diff)
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
index 109ff0f122b..30ef1427d63 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
@@ -187,7 +187,7 @@ class instance_culling_of_stratholme : public InstanceMapScript
// Summon Chromie and global whisper
if (Creature* chromie = instance->SummonCreature(NPC_CHROMIE_2, ChromieSummonPos))
if (!instance->GetPlayers().isEmpty())
- if (Player* player = instance->GetPlayers().getFirst()->getSource())
+ if (Player* player = instance->GetPlayers().getFirst()->GetSource())
sCreatureTextMgr->SendChat(chromie, SAY_CRATES_COMPLETED, player->GetGUID(), CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_MAP);
}
DoUpdateWorldState(WORLDSTATE_CRATES_REVEALED, _crateCount);
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp
index 7a18210791c..72e1cacbb48 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp
@@ -118,14 +118,14 @@ public:
//Sand Breath
if (SandBreath_Timer <= diff)
{
- DoCast(me->getVictim(), SPELL_SAND_BREATH);
+ DoCast(me->GetVictim(), SPELL_SAND_BREATH);
SandBreath_Timer = 15000+rand()%10000;
} else SandBreath_Timer -= diff;
//Time Stop
if (TimeStop_Timer <= diff)
{
- DoCast(me->getVictim(), SPELL_TIME_STOP);
+ DoCast(me->GetVictim(), SPELL_TIME_STOP);
TimeStop_Timer = 20000+rand()%15000;
} else TimeStop_Timer -= diff;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp
index ef0d7b1f418..03ab0f193f4 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp
@@ -117,7 +117,7 @@ public:
//Arcane Blast
if (ArcaneBlast_Timer <= diff)
{
- DoCast(me->getVictim(), SPELL_ARCANE_BLAST);
+ DoCast(me->GetVictim(), SPELL_ARCANE_BLAST);
ArcaneBlast_Timer = 15000+rand()%10000;
} else ArcaneBlast_Timer -= diff;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
index 8159b53741e..ca60a0ca0ef 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
@@ -392,7 +392,7 @@ public:
bool OnGossipHello(Player* player, Creature* creature)
{
- if (creature->isQuestGiver())
+ if (creature->IsQuestGiver())
player->PrepareQuestMenu(creature->GetGUID());
if (player->GetQuestStatus(QUEST_OPENING_PORTAL) == QUEST_STATUS_INCOMPLETE && !player->HasItemCount(ITEM_CHRONO_BEACON))
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
index 37b39b3a938..1278688d7ad 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
@@ -183,7 +183,7 @@ public:
{
if (Creature* pMedivh = instance->GetCreature(MedivhGUID))
{
- if (pMedivh->isAlive())
+ if (pMedivh->IsAlive())
{
pMedivh->DealDamage(pMedivh, pMedivh->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
m_auiEncounter[0] = FAIL;
@@ -212,7 +212,7 @@ public:
{
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{
- if (Player* player = itr->getSource())
+ if (Player* player = itr->GetSource())
{
if (player->GetQuestStatus(QUEST_OPENING_PORTAL) == QUEST_STATUS_INCOMPLETE)
player->AreaExploredOrEventHappens(QUEST_OPENING_PORTAL);
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
index adbc7a14745..c5828966438 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
@@ -126,7 +126,7 @@ public:
//Hammer of Justice
if (HammerOfJustice_Timer <= diff)
{
- DoCast(me->getVictim(), SPELL_HAMMER_OF_JUSTICE);
+ DoCast(me->GetVictim(), SPELL_HAMMER_OF_JUSTICE);
HammerOfJustice_Timer = 60000;
} else HammerOfJustice_Timer -= diff;
@@ -147,7 +147,7 @@ public:
//Consecration
if (Consecration_Timer <= diff)
{
- //DoCast(me->getVictim(), SPELL_CONSECRATION);
+ //DoCast(me->GetVictim(), SPELL_CONSECRATION);
Consecration_Timer = urand(5000, 10000);
} else Consecration_Timer -= diff;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
index b48e0b376ea..7421a116ec0 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
@@ -107,7 +107,7 @@ public:
if (me->IsNonMeleeSpellCasted(false))
me->InterruptNonMeleeSpells(false);
- DoCast(me->getVictim(), SPELL_SAND_BREATH);
+ DoCast(me->GetVictim(), SPELL_SAND_BREATH);
Talk(SAY_BREATH);
@@ -116,7 +116,7 @@ public:
if (ImpendingDeath_Timer <= diff)
{
- DoCast(me->getVictim(), SPELL_IMPENDING_DEATH);
+ DoCast(me->GetVictim(), SPELL_IMPENDING_DEATH);
ImpendingDeath_Timer = 25000+rand()%5000;
} else ImpendingDeath_Timer -= diff;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
index a4de0409573..1fb704fb67e 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
@@ -166,7 +166,7 @@ public:
//Whirlwind
if (Whirlwind_Timer <= diff)
{
- DoCast(me->getVictim(), SPELL_WHIRLWIND);
+ DoCast(me->GetVictim(), SPELL_WHIRLWIND);
Whirlwind_Timer = 20000+rand()%5000;
} else Whirlwind_Timer -= diff;
@@ -174,7 +174,7 @@ public:
if (Fear_Timer <= diff)
{
Talk(SAY_SHOUT);
- DoCast(me->getVictim(), SPELL_FRIGHTENING_SHOUT);
+ DoCast(me->GetVictim(), SPELL_FRIGHTENING_SHOUT);
Fear_Timer = 25000+rand()%10000;
} else Fear_Timer -= diff;
@@ -182,7 +182,7 @@ public:
if (MortalStrike_Timer <= diff)
{
Talk(SAY_MORTAL);
- DoCast(me->getVictim(), SPELL_MORTAL_STRIKE);
+ DoCast(me->GetVictim(), SPELL_MORTAL_STRIKE);
MortalStrike_Timer = 20000+rand()%10000;
} else MortalStrike_Timer -= diff;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
index 05ce40f500b..a488d8de86f 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
@@ -81,7 +81,7 @@ public:
{
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{
- if (Player* player = itr->getSource())
+ if (Player* player = itr->GetSource())
return player;
}
}
@@ -98,7 +98,7 @@ public:
{
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{
- if (Player* player = itr->getSource())
+ if (Player* player = itr->GetSource())
player->KilledMonsterCredit(LODGE_QUEST_TRIGGER, 0);
}
}
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
index b9820790d47..3dfb3ed2a37 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
@@ -78,7 +78,7 @@ public:
bool OnGossipHello(Player* player, Creature* creature)
{
- if (creature->isQuestGiver())
+ if (creature->IsQuestGiver())
player->PrepareQuestMenu(creature->GetGUID());
InstanceScript* instance = creature->GetInstanceScript();
@@ -243,7 +243,7 @@ public:
bool OnGossipHello(Player* player, Creature* creature)
{
- if (creature->isQuestGiver())
+ if (creature->IsQuestGiver())
{
player->PrepareQuestMenu(creature->GetGUID());
player->SendPreparedQuest(creature->GetGUID());
@@ -442,7 +442,7 @@ public:
{
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{
- if (Player* player = itr->getSource())
+ if (Player* player = itr->GetSource())
player->KilledMonsterCredit(20156, 0);
}
}
diff --git a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
index f9e736afd6f..e4b947d4603 100644
--- a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
+++ b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
@@ -149,7 +149,7 @@ class TrashRespawnWorker
case NPC_EGG_PILE:
case NPC_HARBINGER_OF_FLAME:
case NPC_MOLTEN_EGG_TRASH:
- if (!creature->isAlive())
+ if (!creature->IsAlive())
creature->Respawn(true);
break;
case NPC_SMOULDERING_HATCHLING:
@@ -195,10 +195,10 @@ class npc_harbinger_of_flame : public CreatureScript
void MoveInLineOfSight(Unit* unit)
{
- if (me->isInCombat())
+ if (me->IsInCombat())
return;
- if (!unit->isCharmedOwnedByPlayerOrPlayer())
+ if (!unit->IsCharmedOwnedByPlayerOrPlayer())
return;
ScriptedAI::MoveInLineOfSight(unit);
@@ -206,7 +206,7 @@ class npc_harbinger_of_flame : public CreatureScript
void UpdateAI(uint32 diff)
{
- if (!me->isInCombat())
+ if (!me->IsInCombat())
if (!me->GetCurrentSpell(CURRENT_CHANNELED_SPELL))
if (Creature* fireBird = me->FindNearestCreature((me->GetHomePosition().GetPositionY() > -275.0f ? NPC_BLAZING_MONSTROSITY_LEFT : NPC_BLAZING_MONSTROSITY_RIGHT), 100.0f))
DoCast(fireBird, SPELL_FIRE_CHANNELING);
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
index e8c65cf14e4..530255fddcd 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
@@ -127,7 +127,7 @@ public:
Map::PlayerList const& players = me->GetMap()->GetPlayers();
if (!players.isEmpty())
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
- if (Player* player = itr->getSource())
+ if (Player* player = itr->GetSource())
if (player->GetAreaId() == AREA_TOMB_OF_THE_EARTHRAGER)
player->GetSession()->SendPacket(data);
}
diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp
index 96c3c4a6c45..73c3fc179d3 100644
--- a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp
+++ b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp
@@ -118,11 +118,11 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
// Invisible Model
me->SetDisplayId(11686);
- SummonAdds(me->getVictim());
- SummonAdds(me->getVictim());
- SummonAdds(me->getVictim());
- SummonAdds(me->getVictim());
- SummonAdds(me->getVictim());
+ SummonAdds(me->GetVictim());
+ SummonAdds(me->GetVictim());
+ SummonAdds(me->GetVictim());
+ SummonAdds(me->GetVictim());
+ SummonAdds(me->GetVictim());
Invisible = true;
InvisibleTimer = 15000;
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
index e01f2b097b0..39df89892cf 100644
--- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
@@ -265,7 +265,7 @@ public:
}
break;
case 9:
- me->GetMotionMaster()->MoveChase(me->getVictim());
+ me->GetMotionMaster()->MoveChase(me->GetVictim());
BellowingRoarTimer = 1000;
break;
case 10:
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
index 374652ee91d..d2d5c45d864 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
@@ -89,14 +89,14 @@ public:
//AmnenarsWrath_Timer
if (AmnenarsWrath_Timer <= diff)
{
- DoCast(me->getVictim(), SPELL_AMNENNARSWRATH);
+ DoCast(me->GetVictim(), SPELL_AMNENNARSWRATH);
AmnenarsWrath_Timer = 12000;
} else AmnenarsWrath_Timer -= diff;
//FrostBolt_Timer
if (FrostBolt_Timer <= diff)
{
- DoCast(me->getVictim(), SPELL_FROSTBOLT);
+ DoCast(me->GetVictim(), SPELL_FROSTBOLT);
FrostBolt_Timer = 8000;
} else FrostBolt_Timer -= diff;
@@ -109,7 +109,7 @@ public:
if (!Spectrals60 && HealthBelowPct(60))
{
Talk(SAY_SUMMON60);
- DoCast(me->getVictim(), SPELL_FROST_SPECTRES);
+ DoCast(me->GetVictim(), SPELL_FROST_SPECTRES);
Spectrals60 = true;
}
@@ -122,7 +122,7 @@ public:
if (!Spectrals30 && HealthBelowPct(30))
{
Talk(SAY_SUMMON30);
- DoCast(me->getVictim(), SPELL_FROST_SPECTRES);
+ DoCast(me->GetVictim(), SPELL_FROST_SPECTRES);
Spectrals30 = true;
}
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
index 78535b7c3b0..8bea6c5d058 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
@@ -152,7 +152,7 @@ public:
{
if (uiWebTimer <= uiDiff)
{
- DoCast(me->getVictim(), SPELL_WEB);
+ DoCast(me->GetVictim(), SPELL_WEB);
uiWebTimer = urand(7000, 16000);
} else uiWebTimer -= uiDiff;
}
diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
index b374ed47d55..ff775c1a031 100644
--- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
@@ -61,7 +61,7 @@ public:
{
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{
- if (Player* player = itr->getSource())
+ if (Player* player = itr->GetSource())
return player;
}
}
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
index 397d20e92f9..be867ecc33c 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
@@ -157,7 +157,7 @@ class boss_ayamiss : public CreatureScript
SetCombatMovement(true);
me->SetCanFly(false);
Position VictimPos;
- me->getVictim()->GetPosition(&VictimPos);
+ me->GetVictim()->GetPosition(&VictimPos);
me->GetMotionMaster()->MovePoint(POINT_GROUND, VictimPos);
DoResetThreat();
events.ScheduleEvent(EVENT_LASH, urand(5000, 8000));
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
index 5da6606f05f..de6924680ef 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
@@ -208,7 +208,7 @@ class npc_buru_egg : public CreatureScript
void EnterCombat(Unit* attacker)
{
if (Creature* buru = me->GetMap()->GetCreature(_instance->GetData64(DATA_BURU)))
- if (!buru->isInCombat())
+ if (!buru->IsInCombat())
buru->AI()->AttackStart(attacker);
}
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
index 033980d746b..043cba277c9 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
@@ -102,7 +102,7 @@ class boss_kurinnaxx : public CreatureScript
case EVENT_SANDTRAP:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
target->CastSpell(target, SPELL_SANDTRAP, true);
- else if (Unit* victim = me->getVictim())
+ else if (Unit* victim = me->GetVictim())
victim->CastSpell(victim, SPELL_SANDTRAP, true);
events.ScheduleEvent(EVENT_SANDTRAP, urand(5000, 15000));
break;
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
index bd010849045..0d49302bec3 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
@@ -220,8 +220,8 @@ class boss_ossirian : public CreatureScript
events.Update(diff);
// No kiting!
- if (me->GetDistance(me->getVictim()) > 60.00f && me->GetDistance(me->getVictim()) < 120.00f)
- DoCast(me->getVictim(), SPELL_SUMMON);
+ if (me->GetDistance(me->GetVictim()) > 60.00f && me->GetDistance(me->GetVictim()) < 120.00f)
+ DoCast(me->GetVictim(), SPELL_SUMMON);
bool ApplySupreme = true;
@@ -254,7 +254,7 @@ class boss_ossirian : public CreatureScript
events.ScheduleEvent(EVENT_SILENCE, urand(20000, 30000));
break;
case EVENT_CYCLONE:
- DoCast(me->getVictim(), SPELL_CYCLONE);
+ DoCast(me->GetVictim(), SPELL_CYCLONE);
events.ScheduleEvent(EVENT_CYCLONE, 20000);
break;
case EVENT_STOMP:
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
index becbd126d9b..908d2a7a691 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
@@ -98,20 +98,20 @@ public:
//Cleave_Timer
if (Cleave_Timer <= diff)
{
- DoCast(me->getVictim(), SPELL_CLEAVE);
+ DoCast(me->GetVictim(), SPELL_CLEAVE);
Cleave_Timer = urand(5000, 12000);
} else Cleave_Timer -= diff;
//ToxicVolley_Timer
if (ToxicVolley_Timer <= diff)
{
- DoCast(me->getVictim(), SPELL_TOXIC_VOLLEY);
+ DoCast(me->GetVictim(), SPELL_TOXIC_VOLLEY);
ToxicVolley_Timer = urand(10000, 15000);
} else ToxicVolley_Timer -= diff;
if (!HealthAbovePct(5) && !Death)
{
- DoCast(me->getVictim(), SPELL_POISON_CLOUD);
+ DoCast(me->GetVictim(), SPELL_POISON_CLOUD);
Death = true;
}
@@ -209,9 +209,9 @@ public:
//KnockBack_Timer
if (KnockBack_Timer <= diff)
{
- DoCast(me->getVictim(), SPELL_KNOCKBACK);
- if (DoGetThreat(me->getVictim()))
- DoModifyThreatPercent(me->getVictim(), -80);
+ DoCast(me->GetVictim(), SPELL_KNOCKBACK);
+ if (DoGetThreat(me->GetVictim()))
+ DoModifyThreatPercent(me->GetVictim(), -80);
KnockBack_Timer = urand(15000, 25000);
} else KnockBack_Timer -= diff;
@@ -295,7 +295,7 @@ public:
//Fear_Timer
if (Fear_Timer <= diff)
{
- DoCast(me->getVictim(), SPELL_FEAR);
+ DoCast(me->GetVictim(), SPELL_FEAR);
DoResetThreat();
Fear_Timer = 20000;
} else Fear_Timer -= diff;
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
index cd1f5c1befa..b99b092dd7e 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
@@ -601,7 +601,7 @@ public:
{
for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr)
{
- if (Player* pPlr = itr->getSource())
+ if (Player* pPlr = itr->GetSource())
pPlr->PlayDirectSound(RANDOM_SOUND_WHISPER, pPlr);
}
}
@@ -1037,7 +1037,7 @@ public:
return;
//EvadeTimer
- if (!me->IsWithinMeleeRange(me->getVictim()))
+ if (!me->IsWithinMeleeRange(me->GetVictim()))
{
if (EvadeTimer <= diff)
{
@@ -1076,14 +1076,14 @@ public:
//GroundRuptureTimer
if (GroundRuptureTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_GROUND_RUPTURE);
+ DoCast(me->GetVictim(), SPELL_GROUND_RUPTURE);
GroundRuptureTimer = 30000;
} else GroundRuptureTimer -= diff;
//HamstringTimer
if (HamstringTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_HAMSTRING);
+ DoCast(me->GetVictim(), SPELL_HAMSTRING);
HamstringTimer = 5000;
} else HamstringTimer -= diff;
@@ -1149,7 +1149,7 @@ public:
return;
//EvadeTimer
- if (!me->IsWithinMeleeRange(me->getVictim()))
+ if (!me->IsWithinMeleeRange(me->GetVictim()))
{
if (EvadeTimer <= diff)
{
@@ -1188,21 +1188,21 @@ public:
//GroundRuptureTimer
if (GroundRuptureTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_GROUND_RUPTURE);
+ DoCast(me->GetVictim(), SPELL_GROUND_RUPTURE);
GroundRuptureTimer = 30000;
} else GroundRuptureTimer -= diff;
//ThrashTimer
if (ThrashTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_THRASH);
+ DoCast(me->GetVictim(), SPELL_THRASH);
ThrashTimer = 10000;
} else ThrashTimer -= diff;
//HamstringTimer
if (HamstringTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_HAMSTRING);
+ DoCast(me->GetVictim(), SPELL_HAMSTRING);
HamstringTimer = 10000;
} else HamstringTimer -= diff;
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
index de941ec266f..44352c7ef35 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
@@ -106,7 +106,7 @@ public:
//MortalWound_Timer
if (MortalWound_Timer <= diff)
{
- DoCast(me->getVictim(), SPELL_MORTAL_WOUND);
+ DoCast(me->GetVictim(), SPELL_MORTAL_WOUND);
MortalWound_Timer = urand(10000, 20000);
} else MortalWound_Timer -= diff;
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
index f8cf0917c37..206de40320f 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
@@ -107,14 +107,14 @@ public:
//Spit Timer
if (Spit_Timer <= diff)
{
- DoCast(me->getVictim(), SPELL_ACIDSPIT);
+ DoCast(me->GetVictim(), SPELL_ACIDSPIT);
Spit_Timer = urand(5000, 10000);
} else Spit_Timer -= diff;
//NoxiousPoison_Timer
if (NoxiousPoison_Timer <= diff)
{
- DoCast(me->getVictim(), SPELL_NOXIOUSPOISON);
+ DoCast(me->GetVictim(), SPELL_NOXIOUSPOISON);
NoxiousPoison_Timer = urand(12000, 24000);
} else NoxiousPoison_Timer -= diff;
@@ -123,7 +123,7 @@ public:
{
if (PoisonBolt_Timer <= diff)
{
- DoCast(me->getVictim(), SPELL_POISONBOLT);
+ DoCast(me->GetVictim(), SPELL_POISONBOLT);
PoisonBolt_Timer = 3000;
} else PoisonBolt_Timer -= diff;
}
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
index 9b095b0100a..84f35fdf9c0 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
@@ -75,7 +75,7 @@ public:
void EnterCombat(Unit* /*who*/)
{
- DoCast(me->getVictim(), SPELL_BIRTH);
+ DoCast(me->GetVictim(), SPELL_BIRTH);
}
void UpdateAI(uint32 diff)
@@ -87,14 +87,14 @@ public:
//Sweep_Timer
if (!Submerged && Sweep_Timer <= diff)
{
- DoCast(me->getVictim(), SPELL_SWEEP);
+ DoCast(me->GetVictim(), SPELL_SWEEP);
Sweep_Timer = urand(15000, 30000);
} else Sweep_Timer -= diff;
//SandBlast_Timer
if (!Submerged && SandBlast_Timer <= diff)
{
- DoCast(me->getVictim(), SPELL_SANDBLAST);
+ DoCast(me->GetVictim(), SPELL_SANDBLAST);
SandBlast_Timer = urand(20000, 35000);
} else SandBlast_Timer -= diff;
@@ -129,7 +129,7 @@ public:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->setFaction(14);
- DoCast(me->getVictim(), SPELL_GROUND_RUPTURE);
+ DoCast(me->GetVictim(), SPELL_GROUND_RUPTURE);
Submerged = false;
Submerge_Timer = urand(60000, 120000);
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
index 901438409a4..9fb241b961b 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
@@ -72,7 +72,7 @@ class boss_skeram : public CreatureScript
void EnterEvadeMode()
{
ScriptedAI::EnterEvadeMode();
- if (me->isSummon())
+ if (me->IsSummon())
((TempSummon*)me)->UnSummon();
}
@@ -115,7 +115,7 @@ class boss_skeram : public CreatureScript
void JustDied(Unit* /*killer*/)
{
- if (!me->isSummon())
+ if (!me->IsSummon())
Talk(SAY_DEATH);
else
me->RemoveCorpse();
@@ -168,7 +168,7 @@ class boss_skeram : public CreatureScript
}
}
- if (!me->isSummon() && me->GetHealthPct() < _hpct)
+ if (!me->IsSummon() && me->GetHealthPct() < _hpct)
{
DoCast(me, SPELL_SUMMON_IMAGES);
Talk(SAY_SPLIT);
@@ -177,7 +177,7 @@ class boss_skeram : public CreatureScript
events.RescheduleEvent(EVENT_BLINK, 2000);
}
- if (me->IsWithinMeleeRange(me->getVictim()))
+ if (me->IsWithinMeleeRange(me->GetVictim()))
{
events.RescheduleEvent(EVENT_EARTH_SHOCK, 2000);
DoMeleeAttackIfReady();
@@ -201,7 +201,7 @@ class PlayerOrPetCheck
bool operator()(WorldObject* object) const
{
if (object->GetTypeId() != TYPEID_PLAYER)
- if (!object->ToCreature()->isPet())
+ if (!object->ToCreature()->IsPet())
return true;
return false;
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
index 5f677eedcf1..d4b73a2e4a6 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
@@ -154,7 +154,7 @@ struct boss_twinemperorsAI : public ScriptedAI
/// @todo we should activate the other boss location so he can start attackning even if nobody
// is near I dont know how to do that
ScriptedAI* otherAI = CAST_AI(ScriptedAI, pOtherBoss->AI());
- if (!pOtherBoss->isInCombat())
+ if (!pOtherBoss->IsInCombat())
{
DoPlaySoundToSet(me, IAmVeklor() ? SOUND_VL_AGGRO : SOUND_VN_AGGRO);
otherAI->AttackStart(who);
@@ -294,10 +294,10 @@ struct boss_twinemperorsAI : public ScriptedAI
void MoveInLineOfSight(Unit* who)
{
- if (!who || me->getVictim())
+ if (!who || me->GetVictim())
return;
- if (me->canCreatureAttack(who))
+ if (me->CanCreatureAttack(who))
{
float attackRadius = me->GetAttackDistance(who);
if (attackRadius < PULL_RANGE)
@@ -441,7 +441,7 @@ public:
//UnbalancingStrike_Timer
if (UnbalancingStrike_Timer <= diff)
{
- DoCast(me->getVictim(), SPELL_UNBALANCING_STRIKE);
+ DoCast(me->GetVictim(), SPELL_UNBALANCING_STRIKE);
UnbalancingStrike_Timer = 8000+rand()%12000;
} else UnbalancingStrike_Timer -= diff;
@@ -535,10 +535,10 @@ public:
//ShadowBolt_Timer
if (ShadowBolt_Timer <= diff)
{
- if (!me->IsWithinDist(me->getVictim(), 45.0f))
- me->GetMotionMaster()->MoveChase(me->getVictim(), VEKLOR_DIST, 0);
+ if (!me->IsWithinDist(me->GetVictim(), 45.0f))
+ me->GetMotionMaster()->MoveChase(me->GetVictim(), VEKLOR_DIST, 0);
else
- DoCast(me->getVictim(), SPELL_SHADOWBOLT);
+ DoCast(me->GetVictim(), SPELL_SHADOWBOLT);
ShadowBolt_Timer = 2000;
} else ShadowBolt_Timer -= diff;
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
index ba93c3c2640..9f9f159ee9e 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
@@ -271,10 +271,10 @@ class npc_glob_of_viscidus : public CreatureScript
if (BossAI* ViscidusAI = dynamic_cast<BossAI*>(Viscidus->GetAI()))
ViscidusAI->SummonedCreatureDespawn(me);
- if (Viscidus->isAlive() && Viscidus->GetHealthPct() < 5.0f)
+ if (Viscidus->IsAlive() && Viscidus->GetHealthPct() < 5.0f)
{
Viscidus->SetVisible(true);
- Viscidus->getVictim()->Kill(Viscidus);
+ Viscidus->GetVictim()->Kill(Viscidus);
}
else
{
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
index a9419a727b3..f92adef1634 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
@@ -140,7 +140,7 @@ public:
Creature* c = Unit::GetCreature(*me, NearbyGUID[i]);
if (c)
{
- if (!c->isInCombat())
+ if (!c->IsInCombat())
{
c->SetNoCallAssistance(true);
if (c->AI())
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
index 8fd0d2e3621..7d6d6bd003a 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
@@ -314,7 +314,7 @@ public:
{
if (Creature* npc = instance->GetCreature(GetData64(entry)))
{
- if (npc->isAlive())
+ if (npc->IsAlive())
{
npc->SetWalk(true);
npc->GetMotionMaster()->MovePoint(1, x, y, z);
@@ -343,7 +343,7 @@ public:
{
if (Creature* add = instance->GetCreature((*itr)))
{
- if (add->isAlive())
+ if (add->IsAlive())
return false;
}
}
@@ -351,7 +351,7 @@ public:
{
if (Creature* add = instance->GetCreature(((*itr))))
{
- if (add->isAlive())
+ if (add->IsAlive())
return false;
}
}
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
index f3a74c620ae..fdbc40600a3 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
@@ -113,7 +113,7 @@ public:
uint32 postGossipStep;
uint32 Text_Timer;
uint32 ShieldBash_Timer;
- uint32 Revenge_Timer; //this is wrong, spell should never be used unless me->getVictim() dodge, parry or block attack. Trinity support required.
+ uint32 Revenge_Timer; //this is wrong, spell should never be used unless me->GetVictim() dodge, parry or block attack. Trinity support required.
uint64 PlayerGUID;
void Reset()
@@ -165,7 +165,7 @@ public:
if (ShieldBash_Timer <= diff)
{
- DoCast(me->getVictim(), SPELL_SHIELD_BASH);
+ DoCast(me->GetVictim(), SPELL_SHIELD_BASH);
ShieldBash_Timer = 15000;
}
else
@@ -173,7 +173,7 @@ public:
if (Revenge_Timer <= diff)
{
- DoCast(me->getVictim(), SPELL_REVENGE);
+ DoCast(me->GetVictim(), SPELL_REVENGE);
Revenge_Timer = 10000;
}
else
@@ -191,7 +191,7 @@ public:
void switchFactionIfAlive(InstanceScript* instance, uint32 entry)
{
if (Creature* crew = instance->instance->GetCreature(instance->GetData64(entry)))
- if (crew->isAlive())
+ if (crew->IsAlive())
crew->setFaction(FACTION_HOSTILE);
}
};
@@ -338,15 +338,15 @@ public:
if (Bomb_Timer < diff)
{
- DoCast(me->getVictim(), SPELL_BOMB);
+ DoCast(me->GetVictim(), SPELL_BOMB);
Bomb_Timer = 10000;
}
else
Bomb_Timer -= diff;
- if (me->isAttackReady() && !me->IsWithinMeleeRange(me->getVictim()))
+ if (me->isAttackReady() && !me->IsWithinMeleeRange(me->GetVictim()))
{
- DoCast(me->getVictim(), SPELL_SHOOT);
+ DoCast(me->GetVictim(), SPELL_SHOOT);
me->SetSheath(SHEATH_STATE_RANGED);
}
else
@@ -383,7 +383,7 @@ public:
void DestroyDoor()
{
- if (me->isAlive())
+ if (me->IsAlive())
{
me->setFaction(FACTION_FRIENDLY);
me->GetMotionMaster()->MovePoint(0, 1858.57f, 1146.35f, 14.745f);
diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp
index dd202247aaa..1cb7d5cfd37 100644
--- a/src/server/scripts/Kalimdor/boss_azuregos.cpp
+++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp
@@ -108,21 +108,21 @@ public:
// //MarkOfFrostTimer
// if (MarkOfFrostTimer <= diff)
// {
- // DoCast(me->getVictim(), SPELL_MARKOFFROST);
+ // DoCast(me->GetVictim(), SPELL_MARKOFFROST);
// MarkOfFrostTimer = 25000;
// } else MarkOfFrostTimer -= diff;
//ChillTimer
if (ChillTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_CHILL);
+ DoCast(me->GetVictim(), SPELL_CHILL);
ChillTimer = urand(13000, 25000);
} else ChillTimer -= diff;
//BreathTimer
if (BreathTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_FROSTBREATH);
+ DoCast(me->GetVictim(), SPELL_FROSTBREATH);
BreathTimer = urand(10000, 15000);
} else BreathTimer -= diff;
@@ -144,7 +144,7 @@ public:
//CleaveTimer
if (CleaveTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_CLEAVE);
+ DoCast(me->GetVictim(), SPELL_CLEAVE);
CleaveTimer = 7000;
} else CleaveTimer -= diff;
diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp
index 4d7ded57501..4d689d30508 100644
--- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp
+++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp
@@ -133,7 +133,7 @@ class npc_torek : public CreatureScript
if (Rend_Timer <= diff)
{
- DoCast(me->getVictim(), SPELL_REND);
+ DoCast(me->GetVictim(), SPELL_REND);
Rend_Timer = 20000;
} else Rend_Timer -= diff;
@@ -415,7 +415,7 @@ class npc_muglash : public CreatureScript
{
npc_escortAI::UpdateAI(uiDiff);
- if (!me->getVictim())
+ if (!me->GetVictim())
{
if (HasEscortState(STATE_ESCORT_PAUSED) && IsBrazierExtinguished)
{
diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
index f34c658cb64..5fda8ee55ce 100644
--- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
@@ -256,7 +256,7 @@ public:
void UpdateAI(uint32 diff)
{
- if (!me->isInCombat() && !IsTreeEvent)
+ if (!me->IsInCombat() && !IsTreeEvent)
{
if (EmoteTimer <= diff)
{
@@ -273,7 +273,7 @@ public:
if (DynamiteTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_DYNAMITE);
+ DoCast(me->GetVictim(), SPELL_DYNAMITE);
DynamiteTimer = 8000;
} else DynamiteTimer -= diff;
@@ -633,14 +633,14 @@ public:
if (RendTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_REND);
+ DoCast(me->GetVictim(), SPELL_REND);
RendTimer = 30000;
}
else RendTimer -= diff;
if (EnragingBiteTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_ENRAGING_BITE);
+ DoCast(me->GetVictim(), SPELL_ENRAGING_BITE);
EnragingBiteTimer = 15000;
}
else EnragingBiteTimer -= diff;
diff --git a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
index ed50f1a79f1..ee4b4247b55 100644
--- a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
+++ b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
@@ -259,7 +259,7 @@ public:
bool OnGossipHello(Player* player, Creature* creature)
{
- if (creature->isQuestGiver())
+ if (creature->IsQuestGiver())
player->PrepareQuestMenu(creature->GetGUID());
if (player->GetQuestStatus(QUEST_JAINAS_AUTOGRAPH) == QUEST_STATUS_INCOMPLETE)
@@ -297,10 +297,10 @@ public:
bool OnGossipHello(Player* player, Creature* creature)
{
- if (creature->isQuestGiver())
+ if (creature->IsQuestGiver())
player->PrepareQuestMenu(creature->GetGUID());
- if (creature->isVendor() && player->GetQuestRewardStatus(QUEST_NATS_MEASURING_TAPE))
+ if (creature->IsVendor() && player->GetQuestRewardStatus(QUEST_NATS_MEASURING_TAPE))
{
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
player->SEND_GOSSIP_MENU(7640, creature->GetGUID());
@@ -363,7 +363,7 @@ public:
void AttackedBy(Unit* pAttacker)
{
- if (me->getVictim())
+ if (me->GetVictim())
return;
if (me->IsFriendlyTo(pAttacker))
@@ -442,8 +442,8 @@ public:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
SetCombatMovement(true);
- if (me->isInCombat())
- if (Unit* unit = me->getVictim())
+ if (me->IsInCombat())
+ if (Unit* unit = me->GetVictim())
me->GetMotionMaster()->MoveChase(unit);
}
diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp
index e5dc84c607e..bc8f9dab4ec 100644
--- a/src/server/scripts/Kalimdor/zone_moonglade.cpp
+++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp
@@ -358,7 +358,7 @@ public:
void EnterEvadeMode()
{
Player* player = Unit::GetPlayer(*me, PlayerGUID);
- if (player && player->isInCombat() && player->getAttackerForHelper())
+ if (player && player->IsInCombat() && player->getAttackerForHelper())
{
AttackStart(player->getAttackerForHelper());
return;
@@ -390,12 +390,12 @@ public:
return;
}
- if (!me->isInCombat() && !EventOnWait)
+ if (!me->IsInCombat() && !EventOnWait)
{
if (checkPlayerTimer <= diff)
{
Player* player = Unit::GetPlayer(*me, PlayerGUID);
- if (player && player->isInCombat() && player->getAttackerForHelper())
+ if (player && player->IsInCombat() && player->getAttackerForHelper())
AttackStart(player->getAttackerForHelper());
checkPlayerTimer = 1000;
} else checkPlayerTimer -= diff;
diff --git a/src/server/scripts/Kalimdor/zone_mulgore.cpp b/src/server/scripts/Kalimdor/zone_mulgore.cpp
index 626cfa8bc19..010eaff4e22 100644
--- a/src/server/scripts/Kalimdor/zone_mulgore.cpp
+++ b/src/server/scripts/Kalimdor/zone_mulgore.cpp
@@ -56,7 +56,7 @@ public:
bool OnGossipHello(Player* player, Creature* creature)
{
- if (creature->isQuestGiver())
+ if (creature->IsQuestGiver())
player->PrepareQuestMenu(creature->GetGUID());
if (!player->GetQuestRewardStatus(770))
@@ -119,7 +119,7 @@ public:
void SpellHit(Unit* Caster, SpellInfo const* Spell)
{
- if (!me->getVictim() && !EventActive && Spell->Id == SPELL_LUNCH)
+ if (!me->GetVictim() && !EventActive && Spell->Id == SPELL_LUNCH)
{
if (Caster->GetTypeId() == TYPEID_PLAYER)
PlayerGUID = Caster->GetGUID();
diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp
index 95c030e6dfe..c5464d9fbd8 100644
--- a/src/server/scripts/Kalimdor/zone_silithus.cpp
+++ b/src/server/scripts/Kalimdor/zone_silithus.cpp
@@ -95,7 +95,7 @@ public:
bool OnGossipHello(Player* player, Creature* creature)
{
- if (creature->isQuestGiver())
+ if (creature->IsQuestGiver())
player->PrepareQuestMenu(creature->GetGUID());
if (player->GetQuestStatus(7785) == QUEST_STATUS_NONE &&
@@ -205,7 +205,7 @@ public:
bool OnGossipHello(Player* player, Creature* creature)
{
- if (creature->isQuestGiver())
+ if (creature->IsQuestGiver())
player->PrepareQuestMenu(creature->GetGUID());
if (player->GetQuestStatus(8304) == QUEST_STATUS_INCOMPLETE &&
diff --git a/src/server/scripts/Kalimdor/zone_tanaris.cpp b/src/server/scripts/Kalimdor/zone_tanaris.cpp
index 7e4a1d980db..c2ee4f574d6 100644
--- a/src/server/scripts/Kalimdor/zone_tanaris.cpp
+++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp
@@ -120,15 +120,15 @@ public:
{
if (SendItemTimer <= diff)
{
- if (me->getVictim()->GetTypeId() == TYPEID_PLAYER)
- SendItem(me->getVictim());
+ if (me->GetVictim()->GetTypeId() == TYPEID_PLAYER)
+ SendItem(me->GetVictim());
SendItemTimer = 5000;
} else SendItemTimer -= diff;
}
if (FrostShockTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_FROST_SHOCK);
+ DoCast(me->GetVictim(), SPELL_FROST_SHOCK);
FrostShockTimer = 15000;
} else FrostShockTimer -= diff;
@@ -306,7 +306,7 @@ public:
bool OnGossipHello(Player* player, Creature* creature)
{
- if (creature->isQuestGiver())
+ if (creature->IsQuestGiver())
player->PrepareQuestMenu(creature->GetGUID());
if (player->GetQuestStatus(10279) == QUEST_STATUS_INCOMPLETE || player->GetQuestRewardStatus(10279))
@@ -479,7 +479,7 @@ public:
{
FollowerAI::MoveInLineOfSight(who);
- if (!me->getVictim() && !HasFollowState(STATE_FOLLOW_COMPLETE | STATE_FOLLOW_POSTEVENT) && who->GetEntry() == NPC_TORTA)
+ if (!me->GetVictim() && !HasFollowState(STATE_FOLLOW_COMPLETE | STATE_FOLLOW_POSTEVENT) && who->GetEntry() == NPC_TORTA)
{
if (me->IsWithinDistInMap(who, INTERACTION_DISTANCE))
{
@@ -516,7 +516,7 @@ public:
PostEventTimer = 5000;
Creature* torta = Creature::GetCreature(*me, TortaGUID);
- if (!torta || !torta->isAlive())
+ if (!torta || !torta->IsAlive())
{
//something happened, so just complete
SetFollowComplete();
diff --git a/src/server/scripts/Kalimdor/zone_teldrassil.cpp b/src/server/scripts/Kalimdor/zone_teldrassil.cpp
index d7983c2cbe6..43fb5bf1de8 100644
--- a/src/server/scripts/Kalimdor/zone_teldrassil.cpp
+++ b/src/server/scripts/Kalimdor/zone_teldrassil.cpp
@@ -74,7 +74,7 @@ public:
{
FollowerAI::MoveInLineOfSight(who);
- if (!me->getVictim() && !HasFollowState(STATE_FOLLOW_COMPLETE) && who->GetEntry() == NPC_ARYNIA)
+ if (!me->GetVictim() && !HasFollowState(STATE_FOLLOW_COMPLETE) && who->GetEntry() == NPC_ARYNIA)
{
if (me->IsWithinDistInMap(who, 10.0f))
{
diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp
index d21ca8c9427..4cfe76a5c5a 100644
--- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp
+++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp
@@ -194,7 +194,7 @@ public:
bool OnGossipHello(Player* player, Creature* creature)
{
- if (creature->isQuestGiver())
+ if (creature->IsQuestGiver())
player->PrepareQuestMenu(creature->GetGUID());
if (player->GetQuestStatus(6981) == QUEST_STATUS_INCOMPLETE)
@@ -380,7 +380,7 @@ public:
void MoveInLineOfSight(Unit* who)
{
- if (!who || !who->isAlive() || EventInProgress)
+ if (!who || !who->IsAlive() || EventInProgress)
return;
if (who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 10.0f))
@@ -405,7 +405,7 @@ public:
if (!pWarrior)
return;
- if (!pWarrior->isAlive() && pWarrior->GetQuestStatus(1719) == QUEST_STATUS_INCOMPLETE) {
+ if (!pWarrior->IsAlive() && pWarrior->GetQuestStatus(1719) == QUEST_STATUS_INCOMPLETE) {
Talk(SAY_TWIGGY_FLATHEAD_DOWN);
pWarrior->FailQuest(1719);
@@ -414,7 +414,7 @@ public:
if (AffrayChallenger[i])
{
Creature* creature = Unit::GetCreature((*me), AffrayChallenger[i]);
- if (creature && creature->isAlive())
+ if (creature && creature->IsAlive())
creature->DisappearAndDie();
}
}
@@ -422,7 +422,7 @@ public:
if (BigWill) // unsummon bigWill
{
Creature* creature = Unit::GetCreature((*me), BigWill);
- if (creature && creature->isAlive())
+ if (creature && creature->IsAlive())
creature->DisappearAndDie();
}
Reset();
@@ -462,7 +462,7 @@ public:
if (AffrayChallenger[i])
{
Creature* creature = Unit::GetCreature((*me), AffrayChallenger[i]);
- if ((!creature || (!creature->isAlive())) && !ChallengerDown[i])
+ if ((!creature || (!creature->IsAlive())) && !ChallengerDown[i])
{
Talk(SAY_TWIGGY_FLATHEAD_DOWN);
ChallengerDown[i] = true;
@@ -478,7 +478,7 @@ public:
{
Talk(SAY_TWIGGY_FLATHEAD_FRAY);
Creature* creature = Unit::GetCreature((*me), AffrayChallenger[Wave]);
- if (creature && (creature->isAlive()))
+ if (creature && (creature->IsAlive()))
{
creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -504,7 +504,7 @@ public:
else if (Wave >= 6 && EventBigWill && BigWill)
{
Creature* creature = Unit::GetCreature((*me), BigWill);
- if (!creature || !creature->isAlive())
+ if (!creature || !creature->IsAlive())
{
Talk(SAY_TWIGGY_FLATHEAD_OVER);
Reset();
diff --git a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
index e2cf1fdd855..4c7b00a03e7 100644
--- a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
+++ b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
@@ -88,25 +88,25 @@ public:
if (UppercutTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_UPPERCUT);
+ DoCast(me->GetVictim(), SPELL_UPPERCUT);
UppercutTimer = 20000;
} else UppercutTimer -= diff;
if (ThunderclapTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_THUNDERCLAP);
+ DoCast(me->GetVictim(), SPELL_THUNDERCLAP);
ThunderclapTimer = 15000;
} else ThunderclapTimer -= diff;
if (MortalStrikeTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_MORTAL_STRIKE);
+ DoCast(me->GetVictim(), SPELL_MORTAL_STRIKE);
MortalStrikeTimer = 15000;
} else MortalStrikeTimer -= diff;
if (CleaveTimer <= diff)
{
- DoCast(me->getVictim(), SPELL_CLEAVE);
+ DoCast(me->GetVictim(), SPELL_CLEAVE);
CleaveTimer = 7000;
} else CleaveTimer -= diff;
diff --git a/src/server/scripts/Kalimdor/zone_winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp
index 6458047bb60..fe39f1d3abc 100644
--- a/src/server/scripts/Kalimdor/zone_winterspring.cpp
+++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp
@@ -56,10 +56,10 @@ public:
bool OnGossipHello(Player* player, Creature* creature)
{
- if (creature->isQuestGiver())
+ if (creature->IsQuestGiver())
player->PrepareQuestMenu(creature->GetGUID());
- if (creature->isVendor() && player->GetReputationRank(589) == REP_EXALTED)
+ if (creature->IsVendor() && player->GetReputationRank(589) == REP_EXALTED)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());