[c12872] Implement script library hook for NpcSpellClick

(based on commit [12674] - b032ba8) Signed-off-by: Xfurry <xfurry@scriptdev2.com>
cmangos · Aug 13, 2014 · 785fdcc · 785fdcc
1 parent 1fbd3f0
commit 785fdcc
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 6 deletions.
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
@@ -7180,11 +7180,15 @@ void ObjectMgr::LoadNPCSpellClickSpells()
             continue;
         }
 
-        SpellEntry const* spellinfo = sSpellStore.LookupEntry(info.spellId);
-        if (!spellinfo)
+        // spell can be 0 for special or custom cases
+        if (info.spellId)
         {
-            sLog.outErrorDb("Table npc_spellclick_spells references unknown spellid %u. Skipping entry.", info.spellId);
-            continue;
+            SpellEntry const* spellinfo = sSpellStore.LookupEntry(info.spellId);
+            if (!spellinfo)
+            {
+                sLog.outErrorDb("Table npc_spellclick_spells references unknown spellid %u. Skipping entry.", info.spellId);
+                continue;
+            }
         }
 
         if (info.conditionId && !sConditionStorage.LookupEntry<PlayerCondition const*>(info.conditionId))

diff --git a/src/game/ScriptMgr.cpp b/src/game/ScriptMgr.cpp
@@ -73,6 +73,7 @@ ScriptMgr::ScriptMgr() :
     m_pOnGOUse(NULL),
     m_pOnItemUse(NULL),
     m_pOnAreaTrigger(NULL),
+    m_pOnNpcSpellClick(NULL),
     m_pOnProcessEvent(NULL),
     m_pOnEffectDummyCreature(NULL),
     m_pOnEffectDummyGO(NULL),
@@ -2111,6 +2112,11 @@ bool ScriptMgr::OnAreaTrigger(Player* pPlayer, AreaTriggerEntry const* atEntry)
     return m_pOnAreaTrigger != NULL && m_pOnAreaTrigger(pPlayer, atEntry);
 }
 
+bool ScriptMgr::OnNpcSpellClick(Player* pPlayer, Creature* pClickedCreature, uint32 spellId)
+{
+    return m_pOnNpcSpellClick != NULL && m_pOnNpcSpellClick(pPlayer, pClickedCreature, spellId);
+}
+
 bool ScriptMgr::OnProcessEvent(uint32 eventId, Object* pSource, Object* pTarget, bool isStart)
 {
     return m_pOnProcessEvent != NULL && m_pOnProcessEvent(eventId, pSource, pTarget, isStart);
@@ -2191,6 +2197,7 @@ ScriptLoadResult ScriptMgr::LoadScriptLibrary(const char* libName)
     GET_SCRIPT_HOOK_PTR(m_pOnGOUse,                    "GOUse");
     GET_SCRIPT_HOOK_PTR(m_pOnItemUse,                  "ItemUse");
     GET_SCRIPT_HOOK_PTR(m_pOnAreaTrigger,              "AreaTrigger");
+    GET_SCRIPT_HOOK_PTR(m_pOnNpcSpellClick,            "NpcSpellClick");
     GET_SCRIPT_HOOK_PTR(m_pOnProcessEvent,             "ProcessEvent");
     GET_SCRIPT_HOOK_PTR(m_pOnEffectDummyCreature,      "EffectDummyCreature");
     GET_SCRIPT_HOOK_PTR(m_pOnEffectDummyGO,            "EffectDummyGameObject");
@@ -2245,6 +2252,7 @@ void ScriptMgr::UnloadScriptLibrary()
     m_pOnGOUse                  = NULL;
     m_pOnItemUse                = NULL;
     m_pOnAreaTrigger            = NULL;
+    m_pOnNpcSpellClick          = NULL;
     m_pOnProcessEvent           = NULL;
     m_pOnEffectDummyCreature    = NULL;
     m_pOnEffectDummyGO          = NULL;

diff --git a/src/game/ScriptMgr.h b/src/game/ScriptMgr.h
@@ -518,6 +518,7 @@ class ScriptMgr
         bool OnGameObjectUse(Player* pPlayer, GameObject* pGameObject);
         bool OnItemUse(Player* pPlayer, Item* pItem, SpellCastTargets const& targets);
         bool OnAreaTrigger(Player* pPlayer, AreaTriggerEntry const* atEntry);
+        bool OnNpcSpellClick(Player* pPlayer, Creature* pClickedCreature, uint32 spellId);
         bool OnProcessEvent(uint32 eventId, Object* pSource, Object* pTarget, bool isStart);
         bool OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Creature* pTarget, ObjectGuid originalCasterGuid);
         bool OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, GameObject* pTarget, ObjectGuid originalCasterGuid);
@@ -572,6 +573,7 @@ class ScriptMgr
         bool (MANGOS_IMPORT* m_pOnGOUse)(Player*, GameObject*);
         bool (MANGOS_IMPORT* m_pOnItemUse)(Player*, Item*, SpellCastTargets const&);
         bool (MANGOS_IMPORT* m_pOnAreaTrigger)(Player*, AreaTriggerEntry const*);
+        bool (MANGOS_IMPORT* m_pOnNpcSpellClick)(Player*, Creature*, uint32);
         bool (MANGOS_IMPORT* m_pOnProcessEvent)(uint32, Object*, Object*, bool);
         bool (MANGOS_IMPORT* m_pOnEffectDummyCreature)(Unit*, uint32, SpellEffectIndex, Creature*, ObjectGuid);
         bool (MANGOS_IMPORT* m_pOnEffectDummyGO)(Unit*, uint32, SpellEffectIndex, GameObject*, ObjectGuid);

diff --git a/src/game/SpellHandler.cpp b/src/game/SpellHandler.cpp
@@ -623,10 +623,16 @@ void WorldSession::HandleSpellClick(WorldPacket& recv_data)
     {
         if (itr->second.IsFitToRequirements(_player, unit))
         {
+            if (sScriptMgr.OnNpcSpellClick(_player, unit, itr->second.spellId))
+                return;
+
             Unit* caster = (itr->second.castFlags & 0x1) ? (Unit*)_player : (Unit*)unit;
             Unit* target = (itr->second.castFlags & 0x2) ? (Unit*)_player : (Unit*)unit;
 
-            caster->CastSpell(target, itr->second.spellId, true);
+            if (itr->second.spellId)
+                caster->CastSpell(target, itr->second.spellId, true);
+            else
+                sLog.outError("WorldSession::HandleSpellClick: npc_spell_click with entry %u has 0 in spell_id. Not handled custom case?", unit->GetEntry());
         }
     }
 }

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "12871"
+ #define REVISION_NR "12872"
 #endif // __REVISION_NR_H__