[c2820] Use the new ScriptEffect call in SD2. Requires CMangos [c12572]

xfurry · Schmoozerd · commit 740aebf812e1 · 2013-04-30T17:58:10.000+02:00
(based on commit [2820] - 511fa72)

Signed-off-by: Schmoozerd &lt;schmoozerd@scriptdev2.com&gt;
diff --git a/ScriptMgr.cpp b/ScriptMgr.cpp
@@ -591,6 +591,17 @@ bool EffectDummyItem(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, I
     return pTempScript->pEffectDummyItem(pCaster, spellId, effIndex, pTarget);
 }
 
+MANGOS_DLL_EXPORT
+bool EffectScriptEffectCreature(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Creature* pTarget)
+{
+    Script* pTempScript = m_scripts[pTarget->GetScriptId()];
+
+    if (!pTempScript || !pTempScript->pEffectScriptEffectNPC)
+        return false;
+
+    return pTempScript->pEffectScriptEffectNPC(pCaster, spellId, effIndex, pTarget);
+}
+
 MANGOS_DLL_EXPORT
 bool AuraDummy(Aura const* pAura, bool bApply)
 {
diff --git a/ScriptMgr.h b/ScriptMgr.h
@@ -68,8 +68,8 @@ struct Script
         pQuestAcceptNPC(NULL), pQuestAcceptGO(NULL), pQuestAcceptItem(NULL),
         pQuestRewardedNPC(NULL), pQuestRewardedGO(NULL),
         pGOUse(NULL), pItemUse(NULL), pAreaTrigger(NULL), pProcessEventId(NULL),
-        pEffectDummyNPC(NULL), pEffectDummyGO(NULL), pEffectDummyItem(NULL), pEffectAuraDummy(NULL),
-        GetAI(NULL), GetInstanceData(NULL)
+        pEffectDummyNPC(NULL), pEffectDummyGO(NULL), pEffectDummyItem(NULL), pEffectScriptEffectNPC(NULL),
+        pEffectAuraDummy(NULL), GetAI(NULL), GetInstanceData(NULL)
     {}
 
     std::string Name;
@@ -94,6 +94,7 @@ struct Script
     bool (*pEffectDummyNPC)(Unit*, uint32, SpellEffectIndex, Creature*);
     bool (*pEffectDummyGO)(Unit*, uint32, SpellEffectIndex, GameObject*);
     bool (*pEffectDummyItem)(Unit*, uint32, SpellEffectIndex, Item*);
+    bool (*pEffectScriptEffectNPC)(Unit*, uint32, SpellEffectIndex, Creature*);
     bool (*pEffectAuraDummy)(const Aura*, bool);
 
     CreatureAI* (*GetAI)(Creature*);
diff --git a/sd2_revision_nr.h b/sd2_revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __SD2_REVISION_NR_H__
 #define __SD2_REVISION_NR_H__
- #define SD2_REVISION_NR "2819"
+ #define SD2_REVISION_NR "2820"
 #endif // __SD2_REVISION_NR_H__
diff --git a/sql/scriptdev2_script_full.sql b/sql/scriptdev2_script_full.sql
@@ -3,7 +3,7 @@
 --
 
 DELETE FROM sd2_db_version;
-INSERT INTO sd2_db_version (version) VALUES ('ScriptDev2 (for C-MaNGOS c12470+) ');
+INSERT INTO sd2_db_version (version) VALUES ('ScriptDev2 (for CMaNGOS c12572+) ');
 
 --
 -- Below contains data for table `script_texts` mainly used in C++ parts.
diff --git a/sql/updates/r2820_scriptdev2.sql b/sql/updates/r2820_scriptdev2.sql
@@ -0,0 +1 @@
+UPDATE sd2_db_version SET version='ScriptDev2 (for CMaNGOS c12572+) ';

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+UPDATE sd2_db_version SET version='ScriptDev2 (for CMaNGOS c12572+) ';`