diff options
| -rw-r--r-- | sql/FULL/world_scripts_full.sql | 2 | ||||
| -rw-r--r-- | sql/updates/6074_world_scripts.sql | 2 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/northrend/storm_peaks.cpp | 16 |
3 files changed, 11 insertions, 9 deletions
diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql index 67dbcaacea4..8f5881e6014 100644 --- a/sql/FULL/world_scripts_full.sql +++ b/sql/FULL/world_scripts_full.sql @@ -968,7 +968,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_kaya_flathoof' WHERE `entry`=11 UPDATE `creature_template` SET `ScriptName`='npc_agnetta_tyrsdottar' WHERE `entry`=30154; UPDATE `creature_template` SET `ScriptName`='npc_frostborn_scout' WHERE `entry`=29811; UPDATE `creature_template` SET `ScriptName`='npc_thorim' WHERE `entry`=29445; -UPDATE `creature_template` SET `ScriptName`='npc_goblin_prisioner' WHERE `entry`=29446; +UPDATE `creature_template` SET `ScriptName`='npc_goblin_prisoner' WHERE `entry`=29446; UPDATE `gameobject_template` SET ScriptName = 'go_rusty_cage' WHERE `entry`=191544; /* STORMWIND CITY */ diff --git a/sql/updates/6074_world_scripts.sql b/sql/updates/6074_world_scripts.sql new file mode 100644 index 00000000000..e63a8b13c9d --- /dev/null +++ b/sql/updates/6074_world_scripts.sql @@ -0,0 +1,2 @@ +UPDATE `creature_template` SET `ScriptName`='npc_goblin_prisoner' WHERE `entry`=29446; + diff --git a/src/bindings/scripts/scripts/northrend/storm_peaks.cpp b/src/bindings/scripts/scripts/northrend/storm_peaks.cpp index c456b91805c..9cffb2904b9 100644 --- a/src/bindings/scripts/scripts/northrend/storm_peaks.cpp +++ b/src/bindings/scripts/scripts/northrend/storm_peaks.cpp @@ -170,17 +170,17 @@ bool GossipSelect_npc_thorim(Player* pPlayer, Creature* pCreature, uint32 uiSend } /*###### -## npc_goblin_prisioner +## npc_goblin_prisoner ######*/ -enum eGoblinPrisioner +enum eGoblinPrisoner { GO_RUSTY_CAGE = 191544 }; -struct TRINITY_DLL_DECL npc_goblin_prisionerAI : public ScriptedAI +struct TRINITY_DLL_DECL npc_goblin_prisonerAI : public ScriptedAI { - npc_goblin_prisionerAI(Creature* pCreature) : ScriptedAI (pCreature){} + npc_goblin_prisonerAI(Creature* pCreature) : ScriptedAI (pCreature){} void Reset() { @@ -195,9 +195,9 @@ struct TRINITY_DLL_DECL npc_goblin_prisionerAI : public ScriptedAI }; -CreatureAI* GetAI_npc_goblin_prisioner(Creature* pCreature) +CreatureAI* GetAI_npc_goblin_prisoner(Creature* pCreature) { - return new npc_goblin_prisionerAI(pCreature); + return new npc_goblin_prisonerAI(pCreature); } void AddSC_storm_peaks() @@ -224,7 +224,7 @@ void AddSC_storm_peaks() newscript->RegisterSelf(); newscript = new Script; - newscript->Name = "npc_goblin_prisioner"; - newscript->GetAI = &GetAI_npc_goblin_prisioner; + newscript->Name = "npc_goblin_prisoner"; + newscript->GetAI = &GetAI_npc_goblin_prisoner; newscript->RegisterSelf(); } |