aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp6
-rw-r--r--src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp2
-rw-r--r--src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp4
-rw-r--r--src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp6
4 files changed, 8 insertions, 10 deletions
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp
index 5d8295381f9..26b3970c33a 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp
+++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp
@@ -459,16 +459,16 @@ void AddSC_boss_ingvar_the_plunderer()
newscript = new Script;
newscript->Name="boss_ingvar_the_plunderer";
- newscript->GetAI = GetAI_boss_ingvar_the_plunderer;
+ newscript->GetAI = &GetAI_boss_ingvar_the_plunderer;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name="mob_annhylde_the_caller";
- newscript->GetAI = GetAI_mob_annhylde_the_caller;
+ newscript->GetAI = &GetAI_mob_annhylde_the_caller;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name="mob_ingvar_throw_dummy";
- newscript->GetAI = GetAI_mob_ingvar_throw_dummy;
+ newscript->GetAI = &GetAI_mob_ingvar_throw_dummy;
newscript->RegisterSelf();
}
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp
index 00c126a63c5..72cf237ac28 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp
+++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp
@@ -336,6 +336,6 @@ void AddSC_boss_keleseth()
newscript = new Script;
newscript->Name="mob_vrykul_skeleton";
- newscript->GetAI = GetAI_mob_vrykul_skeleton;
+ newscript->GetAI = &GetAI_mob_vrykul_skeleton;
newscript->RegisterSelf();
}
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp
index 14dd7309782..227c985c917 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp
+++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp
@@ -391,11 +391,11 @@ void AddSC_boss_skarvald_dalronn()
newscript = new Script;
newscript->Name="boss_skarvald_the_constructor";
- newscript->GetAI = GetAI_boss_skarvald_the_constructor;
+ newscript->GetAI = &GetAI_boss_skarvald_the_constructor;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name="boss_dalronn_the_controller";
- newscript->GetAI = GetAI_boss_dalronn_the_controller;
+ newscript->GetAI = &GetAI_boss_dalronn_the_controller;
newscript->RegisterSelf();
} \ No newline at end of file
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
index 1a709950b9f..25675baf4b9 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
+++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
@@ -43,8 +43,6 @@ struct TRINITY_DLL_DECL instance_utgarde_keep : public ScriptedInstance
uint64 Dalronn;
uint64 Ingvar;
- bool IsBossDied[2];
-
uint32 Encounters[ENCOUNTERS];
std::string str_data;
@@ -151,7 +149,7 @@ struct TRINITY_DLL_DECL instance_utgarde_keep : public ScriptedInstance
{
//HandleGameObject(doorname, 0);
}
- Encounters[3] = data; break;
+ Encounters[2] = data; break;
}
if (data == DONE)
@@ -166,7 +164,7 @@ struct TRINITY_DLL_DECL instance_utgarde_keep : public ScriptedInstance
{
case DATA_PRINCEKELESETH: return Encounters[0];
case DATA_SKARVALD_DALRONN_EVENT: return Encounters[1];
- case DATA_INGVAR: return Encounters[3];
+ case DATA_INGVAR: return Encounters[2];
}
return 0;