aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/world_scripts_full.sql1
-rw-r--r--src/bindings/scripts/scripts/creature/mob_generic_creature.cpp4
-rw-r--r--src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp20
3 files changed, 3 insertions, 22 deletions
diff --git a/sql/world_scripts_full.sql b/sql/world_scripts_full.sql
index 1249d2443cc..0bd7f59b4b5 100644
--- a/sql/world_scripts_full.sql
+++ b/sql/world_scripts_full.sql
@@ -846,6 +846,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_muru_portal' WHERE `entry`=2577
UPDATE `creature_template` SET `ScriptName`='boss_kalecgos' WHERE `entry`=24850;
UPDATE `creature_template` SET `ScriptName`='boss_sathrovarr' WHERE `entry`=24892;
UPDATE `creature_template` SET `ScriptName`='boss_kalec' WHERE `entry`=24891;
+UPDATE gameobject_template SET scriptname = 'kalocegos_teleporter' WHERE entry = 187055;
UPDATE `creature_template` SET `ScriptName`='npc_blackhole' WHERE `entry`=25855;
/* SWAMP OF SORROWS */
diff --git a/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp b/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp
index ec987e31c0e..cff456e3516 100644
--- a/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp
+++ b/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp
@@ -195,10 +195,10 @@ CreatureAI* GetAI_trigger_periodic(Creature *_Creature)
void AddSC_generic_creature()
{
Script *newscript;
- newscript = new Script;
+ /*newscript = new Script;
newscript->Name="generic_creature";
newscript->GetAI = &GetAI_generic_creature;
- newscript->RegisterSelf();
+ newscript->RegisterSelf();*/
newscript = new Script;
newscript->Name="trigger_periodic";
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp
index a4c873eabcd..e05a1f25095 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp
+++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp
@@ -86,26 +86,11 @@ struct TRINITY_DLL_DECL boss_broggokAI : public ScriptedAI
}
};
-struct TRINITY_DLL_DECL mob_broggok_poisoncloudAI : public ScriptedAI
-{
- mob_broggok_poisoncloudAI(Creature *c) : ScriptedAI(c) {Reset();}
-
- void Reset() { }
- void MoveInLineOfSight(Unit *who) { }
- void AttackStart(Unit *who) { }
- void EnterCombat(Unit* who) { }
-};
-
CreatureAI* GetAI_boss_broggok(Creature *_Creature)
{
return new boss_broggokAI (_Creature);
}
-CreatureAI* GetAI_mob_broggok_poisoncloud(Creature *_Creature)
-{
- return new mob_broggok_poisoncloudAI (_Creature);
-}
-
void AddSC_boss_broggok()
{
Script *newscript;
@@ -113,9 +98,4 @@ void AddSC_boss_broggok()
newscript->Name = "boss_broggok";
newscript->GetAI = &GetAI_boss_broggok;
newscript->RegisterSelf();
-
- newscript = new Script;
- newscript->Name = "mob_broggok_poisoncloud";
- newscript->GetAI = &GetAI_mob_broggok_poisoncloud;
- newscript->RegisterSelf();
}