aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bindings/scripts/scripts/eastern_kingdoms/eversong_woods.cpp2
-rw-r--r--src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp4
-rw-r--r--src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp2
-rw-r--r--src/game/InstanceData.cpp3
-rw-r--r--src/game/InstanceData.h2
5 files changed, 5 insertions, 8 deletions
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/eversong_woods.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/eversong_woods.cpp
index 41608b6c7d5..d1a4e59f0a5 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/eversong_woods.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/eversong_woods.cpp
@@ -430,7 +430,7 @@ void npc_secondTrialAI::JustDied(Unit* Killer)
if (Killer->GetTypeId() == TYPEID_PLAYER)
{
if (Creature *pSummoner = Unit::GetCreature((*m_creature), summonerGuid))
- CAST_AI(master_kelerun_bloodmournAI, Summoner->AI())->SecondTrialKill();
+ CAST_AI(master_kelerun_bloodmournAI, pSummoner->AI())->SecondTrialKill();
// last kill quest complete for group
if (m_creature->GetEntry() == CHAMPION_SUNSTRIKER)
diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp
index b543f9c5c19..6abf61d67bc 100644
--- a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp
+++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp
@@ -63,8 +63,6 @@ struct MANGOS_DLL_DECL boss_jedoga_shadowseekerAI : public ScriptedAI
boss_jedoga_shadowseekerAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceData();
- HeroicMode = c->GetMap()->IsHeroic();
- MaxDistance = 45.0f;
FirstTime = true;
predone = false;
}
@@ -374,7 +372,7 @@ struct MANGOS_DLL_DECL mob_jedoga_initiandAI : public ScriptedAI
if (walking)
{
Creature* boss = m_creature->GetMap()->GetCreature(pInstance->GetData64(DATA_JEDOGA_SHADOWSEEKER));
- if (boss && !CAST_AI(boss_jedoga_shadowseekerAI, boss->AI())->bOpFerok) CAST_AI(boss_jedoga_shadowseekerAI, boss->AI())->opferfail = true;
+ if (boss && !CAST_AI(boss_jedoga_shadowseekerAI, boss->AI())->bOpFerok) CAST_AI(boss_jedoga_shadowseekerAI, boss->AI())->bOpFerokFail = true;
if (Killer->GetTypeId() == TYPEID_PLAYER) pInstance->SetData(DATA_INITIAND_KILLED, 1);
pInstance->SetData64(DATA_ADD_JEDOGA_OPFER, 0);
diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp
index cca89693923..ca766468cfc 100644
--- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp
@@ -164,7 +164,7 @@ struct TRINITY_DLL_DECL boss_razorscaleAI : public BossAI
if (DEVOURINGFLAMETimer < diff)
{
- if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)
+ if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
if (!m_creature->HasInArc(M_PI, target))
DoCast(target, SPELL_DEVOURINGFLAME);
diff --git a/src/game/InstanceData.cpp b/src/game/InstanceData.cpp
index 778a315c084..aaea53e5c7a 100644
--- a/src/game/InstanceData.cpp
+++ b/src/game/InstanceData.cpp
@@ -309,7 +309,7 @@ void InstanceData::DoSendNotifyToInstance(const char *format, ...)
if (i->getSource() && i->getSource()->GetSession())
i->getSource()->GetSession()->SendNotification(format);
}
-
+*/
// Complete Achievement for all players in instance
void InstanceData::DoCompleteAchievement(uint32 achievement)
{
@@ -321,7 +321,6 @@ void InstanceData::DoCompleteAchievement(uint32 achievement)
if (i->getSource())
i->getSource()->CompletedAchievement(AE);
}
-*/
// Remove Auras due to Spell on all players in instance
void InstanceData::DoRemoveAurasDueToSpellOnPlayers(uint32 spell)
diff --git a/src/game/InstanceData.h b/src/game/InstanceData.h
index 010a3d44d42..a277907a30a 100644
--- a/src/game/InstanceData.h
+++ b/src/game/InstanceData.h
@@ -155,10 +155,10 @@ class TRINITY_DLL_SPEC InstanceData : public ZoneScript
/* Not used anywhere yet, not sure if they're needed:
// Send Notify to all players in instance
void DoSendNotifyToInstance(const char *format,...);
+ */
// Complete Achievement for all players in instance
void DoCompleteAchievement(uint32 achievement);
- */
// Remove Auras due to Spell on all players in instance
void DoRemoveAurasDueToSpellOnPlayers(uint32 spell);