araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-13 03:32:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fix a bug in r57_trinity.sql.

--HG--
branch : trunk
This commit is contained in:
megamage
2008-10-18 11:50:02 -05:00
parent f141b156d5
commit a3e03f62d0
5 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/bindings/scripts/include/sc_creature.h
View File

@@ -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();

2
src/bindings/scripts/sql/Updates/r57_trinity.sql
View File

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

9
src/game/CreatureAI.h
View File

@@ -82,12 +82,6 @@ class TRINITY_DLL_SPEC CreatureAI
// Called at stopping attack by any attacker
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,6 +105,9 @@ class TRINITY_DLL_SPEC CreatureAI
// 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
virtual bool canReachByRangeAttack(Unit*) { return false; }

3
src/game/Spell.cpp
View File

@@ -944,6 +944,9 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
if(((Creature*)unit)->AI())
((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);
}
void Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask)

3
src/game/Unit.cpp
View File

@@ -477,9 +477,6 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
pVictim->SetStandState(PLAYER_STATE_NONE);
}
//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() )
((Creature *)pVictim)->AI()->DamageTaken(this, damage);