mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 07:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10572] Drop unused Spell::m_triggeringContainer

Browse source
This commit is contained in:
VladimirMangos 2010-10-01 16:59:40 +04:00
parent 85f8219ecf
commit 41e41947e7
4 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/game/Spell.cpp
View file

@ -319,7 +319,7 @@ void SpellCastTargets::write( ByteBuffer& data ) const
data << m_strTarget; data << m_strTarget;
} }
Spell::Spell( Unit* caster, SpellEntry const *info, bool triggered, ObjectGuid originalCasterGUID, Spell** triggeringContainer, SpellEntry const* triggeredBy ) Spell::Spell( Unit* caster, SpellEntry const *info, bool triggered, ObjectGuid originalCasterGUID, SpellEntry const* triggeredBy )
{ {
MANGOS_ASSERT( caster != NULL && info != NULL ); MANGOS_ASSERT( caster != NULL && info != NULL );
MANGOS_ASSERT( info == sSpellStore.LookupEntry( info->Id ) && "`info` must be pointer to sSpellStore element"); MANGOS_ASSERT( info == sSpellStore.LookupEntry( info->Id ) && "`info` must be pointer to sSpellStore element");
@ -337,7 +337,6 @@ Spell::Spell( Unit* caster, SpellEntry const *info, bool triggered, ObjectGuid o
m_triggeredBySpellInfo = triggeredBy; m_triggeredBySpellInfo = triggeredBy;
m_caster = caster; m_caster = caster;
m_selfContainer = NULL; m_selfContainer = NULL;
m_triggeringContainer = triggeringContainer;
m_referencedFromCurrentSpell = false; m_referencedFromCurrentSpell = false;
m_executedCurrently = false; m_executedCurrently = false;
m_delayStart = 0; m_delayStart = 0;
@ -4206,7 +4205,7 @@ void Spell::CastTriggerSpells()
{ {
for(SpellInfoList::const_iterator si = m_TriggerSpells.begin(); si != m_TriggerSpells.end(); ++si) for(SpellInfoList::const_iterator si = m_TriggerSpells.begin(); si != m_TriggerSpells.end(); ++si)
{ {
Spell* spell = new Spell(m_caster, (*si), true, m_originalCasterGUID, m_selfContainer); Spell* spell = new Spell(m_caster, (*si), true, m_originalCasterGUID);
spell->prepare(&m_targets); // use original spell original targets spell->prepare(&m_targets); // use original spell original targets
} }
} }

3
src/game/Spell.h
View file

@ -342,7 +342,7 @@ class Spell
void EffectSpecCount(SpellEffectIndex eff_idx); void EffectSpecCount(SpellEffectIndex eff_idx);
void EffectActivateSpec(SpellEffectIndex eff_idx); void EffectActivateSpec(SpellEffectIndex eff_idx);
Spell( Unit* caster, SpellEntry const *info, bool triggered, ObjectGuid originalCasterGUID = ObjectGuid(), Spell** triggeringContainer = NULL, SpellEntry const* triggeredBy = NULL); Spell(Unit* caster, SpellEntry const *info, bool triggered, ObjectGuid originalCasterGUID = ObjectGuid(), SpellEntry const* triggeredBy = NULL);
~Spell(); ~Spell();
void prepare(SpellCastTargets const* targets, Aura* triggeredByAura = NULL); void prepare(SpellCastTargets const* targets, Aura* triggeredByAura = NULL);
@ -501,7 +501,6 @@ class Spell
Unit* m_originalCaster; // cached pointer for m_originalCaster, updated at Spell::UpdatePointers() Unit* m_originalCaster; // cached pointer for m_originalCaster, updated at Spell::UpdatePointers()
Spell** m_selfContainer; // pointer to our spell container (if applicable) Spell** m_selfContainer; // pointer to our spell container (if applicable)
Spell** m_triggeringContainer; // pointer to container with spell that has triggered us
//Spell data //Spell data
SpellSchoolMask m_spellSchoolMask; // Spell school (can be overwrite for some spells (wand shoot for example) SpellSchoolMask m_spellSchoolMask; // Spell school (can be overwrite for some spells (wand shoot for example)

6
src/game/Unit.cpp
View file

@ -1118,7 +1118,7 @@ void Unit::CastSpell(Unit* Victim, SpellEntry const *spellInfo, bool triggered,
triggeredBy = triggeredByAura->GetSpellProto(); triggeredBy = triggeredByAura->GetSpellProto();
} }
Spell *spell = new Spell(this, spellInfo, triggered, originalCaster, NULL, triggeredBy); Spell *spell = new Spell(this, spellInfo, triggered, originalCaster, triggeredBy);
SpellCastTargets targets; SpellCastTargets targets;
targets.setUnitTarget( Victim ); targets.setUnitTarget( Victim );
@ -1164,7 +1164,7 @@ void Unit::CastCustomSpell(Unit* Victim, SpellEntry const *spellInfo, int32 cons
triggeredBy = triggeredByAura->GetSpellProto(); triggeredBy = triggeredByAura->GetSpellProto();
} }
Spell *spell = new Spell(this, spellInfo, triggered, originalCaster, NULL, triggeredBy); Spell *spell = new Spell(this, spellInfo, triggered, originalCaster, triggeredBy);
if(bp0) if(bp0)
spell->m_currentBasePoints[EFFECT_INDEX_0] = *bp0; spell->m_currentBasePoints[EFFECT_INDEX_0] = *bp0;
@ -1221,7 +1221,7 @@ void Unit::CastSpell(float x, float y, float z, SpellEntry const *spellInfo, boo
triggeredBy = triggeredByAura->GetSpellProto(); triggeredBy = triggeredByAura->GetSpellProto();
} }
Spell *spell = new Spell(this, spellInfo, triggered, originalCaster, NULL, triggeredBy); Spell *spell = new Spell(this, spellInfo, triggered, originalCaster, triggeredBy);
SpellCastTargets targets; SpellCastTargets targets;
targets.setDestination(x, y, z); targets.setDestination(x, y, z);

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10571" #define REVISION_NR "10572"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__