Changeset 55

Timestamp:

11/19/08 13:29:45 (17 years ago)

Author:

yumileroy

Message:

[svn] Remove unused script event functions HealBy? and DamageDeal?. Add new function SpellHitTarget?.
Fix a bug in r57_trinity.sql.

Original author: megamage
Date: 2008-10-18 11:50:02-05:00

Location:

trunk/src

Files:

• bindings/scripts/include/sc_creature.h (modified) (2 diffs)
• bindings/scripts/sql/Updates/r57_trinity.sql (modified) (1 diff)
• game/CreatureAI.h (modified) (2 diffs)
• game/Spell.cpp (modified) (1 diff)
• game/Unit.cpp (modified) (1 diff)

trunk/src/bindings/scripts/include/sc_creature.h

@@ -30 +30 @@
     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) {}
@@ -58 +52 @@
 
     // 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)

trunk/src/bindings/scripts/sql/Updates/r57_trinity.sql

@@ -37 +37 @@
 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);
+UPDATE `creature_template` SET `ScriptName` = 'npc_zulaman_hostage' WHERE `entry` IN (23790, 23999, 24024, 24001);

trunk/src/game/CreatureAI.h

@@ -83 +83 @@
         virtual void EnterEvadeMode() = 0;
 
-        // Called at any heal cast/item used (call non implemented)
-        virtual void HealBy(Unit * /*healer*/, uint32 /*amount_healed*/) {}
-
-        // Called at any Damage to any victim (before damage apply)
-        virtual void DamageDeal(Unit * /*done_to*/, uint32 & /*damage*/) {}
-
         // Called at any Damage from any attacker (before damage apply)
         virtual void DamageTaken(Unit *done_by, uint32 & /*damage*/) { AttackedBy(done_by); }
@@ -111 +105 @@
         // Called when hit by a spell
         virtual void SpellHit(Unit*, const SpellEntry*) {}
+
+        // Called when spell hits a target
+        virtual void SpellHitTarget(Unit* target, const SpellEntry*) {} 
 
         // Called when vitim entered water and creature can not enter water

trunk/src/game/Spell.cpp

@@ -945 +945 @@
             ((Creature*)unit)->AI()->SpellHit(m_caster ,m_spellInfo);
     }
+
+    if(m_caster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_caster)->AI())
+        ((Creature*)m_caster)->AI()->SpellHitTarget(unit, m_spellInfo);
 }
 

trunk/src/game/Unit.cpp

@@ -478 +478 @@
     }
 
-    //Script Event damage Deal
-    if( GetTypeId()== TYPEID_UNIT && ((Creature *)this)->AI())
-        ((Creature *)this)->AI()->DamageDeal(pVictim, damage);
     //Script Event damage taken
     if( pVictim->GetTypeId()== TYPEID_UNIT && ((Creature *)pVictim)->AI() )