ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(clang): fix build on version 7 (#1391)

Browse source 
Remove unused private fields
This commit is contained in:
Stoabrogga 2019-02-09 23:34:28 +01:00 • committed by GitHub
parent 01c6d32ac9
commit 2d3ea3a308
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/server/game/Entities/Unit/Unit.cpp
View file

@ -141,9 +141,9 @@ void DamageInfo::BlockDamage(uint32 amount)
m_damage -= amount;
}
ProcEventInfo::ProcEventInfo(Unit* actor, Unit* actionTarget, Unit* procTarget, uint32 typeMask, uint32 spellTypeMask, uint32 spellPhaseMask, uint32 hitMask, Spell* spell, DamageInfo* damageInfo, HealInfo* healInfo, SpellInfo const* triggeredByAuraSpell)
ProcEventInfo::ProcEventInfo(Unit* actor, Unit* actionTarget, Unit* procTarget, uint32 typeMask, uint32 spellTypeMask, uint32 spellPhaseMask, uint32 hitMask, Spell* /*spell*/, DamageInfo* damageInfo, HealInfo* healInfo, SpellInfo const* triggeredByAuraSpell)
:_actor(actor), _actionTarget(actionTarget), _procTarget(procTarget), _typeMask(typeMask), _spellTypeMask(spellTypeMask), _spellPhaseMask(spellPhaseMask),
_hitMask(hitMask), _spell(spell), _damageInfo(damageInfo), _healInfo(healInfo), _triggeredByAuraSpell(triggeredByAuraSpell)
_hitMask(hitMask), _damageInfo(damageInfo), _healInfo(healInfo), _triggeredByAuraSpell(triggeredByAuraSpell)
{
}

1
src/server/game/Entities/Unit/Unit.h
View file

@ -938,7 +938,6 @@ private:
uint32 _spellPhaseMask;
uint32 _hitMask;
uint32 _cooldown;
Spell* _spell;
DamageInfo* _damageInfo;
HealInfo* _healInfo;
SpellInfo const* const _triggeredByAuraSpell;

7
src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
View file

@ -1919,7 +1919,7 @@ class FlameLeviathanPursuedTargetSelector
};
public:
explicit FlameLeviathanPursuedTargetSelector(Unit* unit) : _me(unit) {};
explicit FlameLeviathanPursuedTargetSelector() {};
bool operator()(WorldObject* target) const
{
@ -1949,9 +1949,6 @@ class FlameLeviathanPursuedTargetSelector
return !playerFound;
}
private:
Unit const* _me;
};
class spell_pursue : public SpellScriptLoader
@ -1965,7 +1962,7 @@ class spell_pursue : public SpellScriptLoader
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(FlameLeviathanPursuedTargetSelector(GetCaster()));
targets.remove_if(FlameLeviathanPursuedTargetSelector());
if (targets.empty())
{
if (Creature* caster = GetCaster()->ToCreature())