aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/server/game/Entities/Player/Player.cpp2
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp8
-rw-r--r--src/server/game/Spells/Spell.cpp8
-rw-r--r--src/server/game/Spells/Spell.h8
-rw-r--r--src/server/game/Spells/SpellScript.h4
5 files changed, 15 insertions, 15 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index e03e856e156..e3c8913b1b0 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -19818,7 +19818,7 @@ void Player::_SaveAuras(SQLTransaction& trans)
stmt->setBinary(index++, key.Item.GetRawValue());
stmt->setUInt32(index++, key.SpellId);
stmt->setUInt32(index++, key.EffectMask);
- stmt->setUInt8(index++, recalculateMask);
+ stmt->setUInt32(index++, recalculateMask);
stmt->setUInt8(index++, aura->GetStackAmount());
stmt->setInt32(index++, aura->GetMaxDuration());
stmt->setInt32(index++, aura->GetDuration());
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 2d0f9578011..9eaeb2a7966 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -3694,8 +3694,8 @@ void Unit::RemoveAurasDueToSpellBySteal(uint32 spellId, ObjectGuid casterGUID, U
{
int32 damage[MAX_SPELL_EFFECTS];
int32 baseDamage[MAX_SPELL_EFFECTS];
- uint8 effMask = 0;
- uint8 recalculateMask = 0;
+ uint32 effMask = 0;
+ uint32 recalculateMask = 0;
Unit* caster = aura->GetCaster();
for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
{
@@ -3703,9 +3703,9 @@ void Unit::RemoveAurasDueToSpellBySteal(uint32 spellId, ObjectGuid casterGUID, U
{
baseDamage[i] = aura->GetEffect(i)->GetBaseAmount();
damage[i] = aura->GetEffect(i)->GetAmount();
- effMask |= (1<<i);
+ effMask |= 1 << i;
if (aura->GetEffect(i)->CanBeRecalculated())
- recalculateMask |= (1<<i);
+ recalculateMask |= 1 << i;
}
else
{
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 83c67896df0..ae63cd19ebb 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -2264,7 +2264,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target)
Unit* unit = m_caster->GetGUID() == target->targetGUID ? m_caster : ObjectAccessor::GetUnit(*m_caster, target->targetGUID);
if (!unit && target->targetGUID.IsPlayer()) // only players may be targeted across maps
{
- uint8 farMask = 0;
+ uint32 farMask = 0;
// create far target mask
for (SpellEffectInfo const* effect : GetEffects())
if (effect && effect->IsFarUnitTargetEffect())
@@ -2570,7 +2570,7 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit* unit, uint32 effectMask, bool scaleA
}
}
- uint8 aura_effmask = 0;
+ uint32 aura_effmask = 0;
for (SpellEffectInfo const* effect : GetEffects())
if (effect && (effectMask & (1 << effect->EffectIndex) && effect->IsUnitOwnedAuraEffect()))
aura_effmask |= 1 << effect->EffectIndex;
@@ -2694,7 +2694,7 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit* unit, uint32 effectMask, bool scaleA
return SPELL_MISS_NONE;
}
-void Spell::DoTriggersOnSpellHit(Unit* unit, uint8 effMask)
+void Spell::DoTriggersOnSpellHit(Unit* unit, uint32 effMask)
{
// Apply additional spell effects to target
/// @todo move this code to scripts
@@ -7343,7 +7343,7 @@ bool Spell::CheckScriptEffectImplicitTargets(uint32 effIndex, uint32 effIndexToC
return true;
}
-bool Spell::CanExecuteTriggersOnHit(uint8 effMask, SpellInfo const* triggeredByAura) const
+bool Spell::CanExecuteTriggersOnHit(uint32 effMask, SpellInfo const* triggeredByAura /*= nullptr*/) const
{
bool only_on_caster = (triggeredByAura && (triggeredByAura->HasAttribute(SPELL_ATTR4_PROC_ONLY_ON_CASTER)));
// If triggeredByAura has SPELL_ATTR4_PROC_ONLY_ON_CASTER then it can only proc on a cast spell with TARGET_UNIT_CASTER
diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h
index 7722d33003f..3d9a0e489aa 100644
--- a/src/server/game/Spells/Spell.h
+++ b/src/server/game/Spells/Spell.h
@@ -703,8 +703,8 @@ class TC_GAME_API Spell
bool m_referencedFromCurrentSpell; // mark as references to prevent deleted and access by dead pointers
bool m_executedCurrently; // mark as executed to prevent deleted and access by dead pointers
bool m_needComboPoints;
- uint8 m_applyMultiplierMask;
- float m_damageMultipliers[3];
+ uint32 m_applyMultiplierMask;
+ float m_damageMultipliers[MAX_SPELL_EFFECTS];
// Current targets, to be used in SpellEffects (MUST BE USED ONLY IN SPELL EFFECTS)
Unit* unitTarget;
@@ -784,7 +784,7 @@ class TC_GAME_API Spell
void DoAllEffectOnTarget(TargetInfo* target);
SpellMissInfo DoSpellHitOnUnit(Unit* unit, uint32 effectMask, bool scaleAura);
- void DoTriggersOnSpellHit(Unit* unit, uint8 effMask);
+ void DoTriggersOnSpellHit(Unit* unit, uint32 effMask);
void DoAllEffectOnTarget(GOTargetInfo* target);
void DoAllEffectOnTarget(ItemTargetInfo* target);
bool UpdateChanneledTargetList();
@@ -821,7 +821,7 @@ class TC_GAME_API Spell
int32 chance;
};
- bool CanExecuteTriggersOnHit(uint8 effMask, SpellInfo const* triggeredByAura = NULL) const;
+ bool CanExecuteTriggersOnHit(uint32 effMask, SpellInfo const* triggeredByAura = nullptr) const;
void PrepareTriggersExecutedOnHit();
typedef std::list<HitTriggerSpell> HitTriggerSpellList;
HitTriggerSpellList m_hitTriggerSpells;
diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h
index 0f7d78f292b..5513d95b9b9 100644
--- a/src/server/game/Spells/SpellScript.h
+++ b/src/server/game/Spells/SpellScript.h
@@ -289,8 +289,8 @@ class TC_GAME_API SpellScript : public _SpellScript
bool IsInEffectHook() const;
private:
Spell* m_spell;
- uint8 m_hitPreventEffectMask;
- uint8 m_hitPreventDefaultEffectMask;
+ uint32 m_hitPreventEffectMask;
+ uint32 m_hitPreventDefaultEffectMask;
public:
//
// SpellScript interface