[3018] Implement NpcSpellClick script hook. Requires CMaNGOS 12674+

Author: xfurry

ScriptMgr.cpp

@@ -446,6 +446,17 @@ bool AreaTrigger(Player* pPlayer, AreaTriggerEntry const* atEntry)
     return pTempScript->pAreaTrigger(pPlayer, atEntry);
 }
 
+MANGOS_DLL_EXPORT
+bool NpcSpellClick(Player* pPlayer, Creature* pClickedCreature, uint32 uiSpellId)
+{
+    Script* pTempScript = m_scripts[pClickedCreature->GetScriptId()];
+
+    if (!pTempScript || !pTempScript->pNpcSpellClick)
+        return false;
+
+    return pTempScript->pNpcSpellClick(pPlayer, pClickedCreature, uiSpellId);
+}
+
 MANGOS_DLL_EXPORT
 bool ProcessEvent(uint32 uiEventId, Object* pSource, Object* pTarget, bool bIsStart)
 {

ScriptMgr.h

@@ -67,7 +67,7 @@ struct Script
         pDialogStatusNPC(NULL), pDialogStatusGO(NULL),
         pQuestAcceptNPC(NULL), pQuestAcceptGO(NULL), pQuestAcceptItem(NULL),
         pQuestRewardedNPC(NULL), pQuestRewardedGO(NULL),
-        pGOUse(NULL), pItemUse(NULL), pAreaTrigger(NULL), pProcessEventId(NULL),
+        pGOUse(NULL), pItemUse(NULL), pAreaTrigger(NULL), pNpcSpellClick(NULL), pProcessEventId(NULL),
         pEffectDummyNPC(NULL), pEffectDummyGO(NULL), pEffectDummyItem(NULL), pEffectScriptEffectNPC(NULL),
         pEffectAuraDummy(NULL), GetAI(NULL), GetInstanceData(NULL)
     {}
@@ -90,6 +90,7 @@ struct Script
     bool (*pGOUse)(Player*, GameObject*);
     bool (*pItemUse)(Player*, Item*, SpellCastTargets const&);
     bool (*pAreaTrigger)(Player*, AreaTriggerEntry const*);
+    bool (*pNpcSpellClick)(Player*, Creature*, uint32);
     bool (*pProcessEventId)(uint32, Object*, Object*, bool);
     bool (*pEffectDummyNPC)(Unit*, uint32, SpellEffectIndex, Creature*, ObjectGuid);
     bool (*pEffectDummyGO)(Unit*, uint32, SpellEffectIndex, GameObject*, ObjectGuid);

sd2_revision_nr.h

@@ -1,4 +1,4 @@
 #ifndef __SD2_REVISION_NR_H__
 #define __SD2_REVISION_NR_H__
- #define SD2_REVISION_NR "3017"
+ #define SD2_REVISION_NR "3018"
 #endif // __SD2_REVISION_NR_H__

sql/scriptdev2_script_full.sql

@@ -3,7 +3,7 @@
 --
 
 DELETE FROM sd2_db_version;
-INSERT INTO sd2_db_version (version) VALUES ('ScriptDev2 (for CMaNGOS 12661+) ');
+INSERT INTO sd2_db_version (version) VALUES ('ScriptDev2 (for CMaNGOS 12674+) ');
 
 --
 -- Below contains data for table `script_texts` mainly used in C++ parts.

sql/updates/r3018_scriptdev2.sql

@@ -0,0 +1 @@
+UPDATE sd2_db_version SET version='ScriptDev2 (for CMaNGOS 12674+) ';