aboutsummaryrefslogtreecommitdiff
path: root/src/game/Spell.h
diff options
context:
space:
mode:
authorQAston <none@none>2009-06-29 20:32:56 +0200
committerQAston <none@none>2009-06-29 20:32:56 +0200
commit40679890962457c6c85adad6b93f5f6bda73a635 (patch)
tree81d0244ff7ff3f66850da9cc43972e4c8c370ed9 /src/game/Spell.h
parentcf414bb7ca796c2d4a065b803826c02d833e3003 (diff)
*Implement aura rank selection for aoe auras casted by player
*More correct level requirement checks for unit target *Fix some visual issues with spells which are interrupted after SendSpellStart but before SendSpellGo *Prevent adding spellmods permamently to already finished spells. --HG-- branch : trunk
Diffstat (limited to 'src/game/Spell.h')
-rw-r--r--src/game/Spell.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/game/Spell.h b/src/game/Spell.h
index 59f21fd6bae..21a73b2597a 100644
--- a/src/game/Spell.h
+++ b/src/game/Spell.h
@@ -568,9 +568,10 @@ class Spell
SpellMissInfo reflectResult:8;
uint8 effectMask:8;
bool processed:1;
- bool alive:1;
+ bool alive:1;
+ bool crit:1;
+ bool scaleAura:1;
int32 damage;
- bool crit;
};
std::list<TargetInfo> m_UniqueTargetInfo;
uint8 m_needAliveTargetMask; // Mask req. alive targets
@@ -597,7 +598,7 @@ class Spell
void AddGOTarget(uint64 goGUID, uint32 effIndex);
void AddItemTarget(Item* target, uint32 effIndex);
void DoAllEffectOnTarget(TargetInfo *target);
- SpellMissInfo DoSpellHitOnUnit(Unit *unit, uint32 effectMask);
+ SpellMissInfo DoSpellHitOnUnit(Unit *unit, uint32 effectMask, bool scaleAura);
void DoTriggersOnSpellHit(Unit *unit);
void DoAllEffectOnTarget(GOTargetInfo *target);
void DoAllEffectOnTarget(ItemTargetInfo *target);
@@ -638,6 +639,7 @@ class Spell
uint32 m_customAttr;
bool m_skipCheck;
uint32 m_effectMask;
+ uint8 m_auraScaleMask;
#ifdef MAP_BASED_RAND_GEN
int32 irand(int32 min, int32 max) { return int32 (m_caster->GetMap()->mtRand.randInt(max - min)) + min; }