[svn] Remove unused script event functions HealBy and DamageDeal. Add new function SpellHitTarget.

Fix a bug in r57_trinity.sql.

--HG--
branch : trunk

2 files changed, 5 insertions, 8 deletions

diff --git a/src/bindings/scripts/include/sc_creature.h b/src/bindings/scripts/include/sc_creature.h
index 802c118c1d5..6b3d731d256 100644
--- a/src/bindings/scripts/include/sc_creature.h
+++ b/src/bindings/scripts/include/sc_creature.h
@@ -29,12 +29,6 @@ struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI
     //Called at stoping attack by any attacker
     void EnterEvadeMode();
 
-    //Called at any heal cast/item used (call non implemented in Trinity)
-    void HealBy(Unit *healer, uint32 amount_healed) {}
-
-    // Called at any Damage to any victim (before damage apply)
-    void DamageDeal(Unit *done_to, uint32 &damage) {}
-
     // Called at any Damage from any attacker (before damage apply)
     void DamageTaken(Unit *done_by, uint32 &damage) {}
 
@@ -57,7 +51,10 @@ struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI
     void SummonedCreatureDespawn(Creature* /*unit*/) {}
 
     // Called when hit by a spell
-    void SpellHit(Unit*, const SpellEntry*) {}
+    void SpellHit(Unit* caster, const SpellEntry*) {}
+
+    // Called when spell hits a target
+    void SpellHitTarget(Unit* target, const SpellEntry*) {}
 
     // Called when creature is spawned or respawned (for reseting variables)
     void JustRespawned();
diff --git a/src/bindings/scripts/sql/Updates/r57_trinity.sql b/src/bindings/scripts/sql/Updates/r57_trinity.sql
index bbdb29af158..b7f61b9edae 100644
--- a/src/bindings/scripts/sql/Updates/r57_trinity.sql
+++ b/src/bindings/scripts/sql/Updates/r57_trinity.sql
@@ -36,4 +36,4 @@ INSERT INTO `spell_proc_event` VALUES ('43983', '0', '0', '0', '0', '0', '16384'
 DELETE FROM `spell_script_target` WHERE `entry` = 42577;

 INSERT INTO `spell_script_target` VALUES ('42577', '1', '24136');

 

-UPDATE `creature_template` SET `lootid` = `entry`, `ScriptName` = 'npc_zulaman_hostage' WHERE `entry` IN (23790, 23999, 24024, 24001);
\ No newline at end of file
+UPDATE `creature_template` SET `ScriptName` = 'npc_zulaman_hostage' WHERE `entry` IN (23790, 23999, 24024, 24001);
\ No newline at end of file