diff options
| author | Shauren <shauren.trinity@gmail.com> | 2018-12-09 14:45:03 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2018-12-09 14:45:03 +0100 |
| commit | f94deace764f0b8d99249760d2bc2e85c891c387 (patch) | |
| tree | 4c7c56f34768fc7aef05268061a12845c5bf67ce /src/server/game/Spells/Spell.h | |
| parent | 8725eec9c1c15f3e76bd9d524d4a5d8d0b3f0a44 (diff) | |
| parent | a70030ff252b266d12023ffada2a309409c1ccdb (diff) | |
Merge branch 'bfa'
Diffstat (limited to 'src/server/game/Spells/Spell.h')
| -rw-r--r-- | src/server/game/Spells/Spell.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index 45b012a82e6..c0a9dff527b 100644 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -296,8 +296,9 @@ class TC_GAME_API SpellCastTargets struct SpellValue { - explicit SpellValue(Difficulty diff, SpellInfo const* proto); + explicit SpellValue(Difficulty diff, SpellInfo const* proto, Unit const* caster); int32 EffectBasePoints[MAX_SPELL_EFFECTS]; + uint32 CustomBasePointsMask; uint32 MaxAffectedTargets; float RadiusMod; uint8 AuraStackAmount; @@ -788,7 +789,6 @@ class TC_GAME_API Spell bool processed; bool alive; bool crit; - bool scaleAura; }; std::vector<TargetInfo> m_UniqueTargetInfo; uint32 m_channelTargetEffectMask; // Mask req. alive targets @@ -817,7 +817,7 @@ class TC_GAME_API Spell void AddDestTarget(SpellDestination const& dest, uint32 effIndex); void DoAllEffectOnTarget(TargetInfo* target); - SpellMissInfo DoSpellHitOnUnit(Unit* unit, uint32 effectMask, bool scaleAura); + SpellMissInfo DoSpellHitOnUnit(Unit* unit, uint32 effectMask); void DoTriggersOnSpellHit(Unit* unit, uint32 effMask); void DoAllEffectOnTarget(GOTargetInfo* target); void DoAllEffectOnTarget(ItemTargetInfo* target); @@ -884,7 +884,6 @@ class TC_GAME_API Spell SpellInfo const* m_triggeredByAuraSpell; bool m_skipCheck; - uint32 m_auraScaleMask; std::unique_ptr<PathGenerator> m_preGeneratedPath; std::vector<SpellLogEffectPowerDrainParams> _powerDrainTargets[MAX_SPELL_EFFECTS]; |