sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Unit/Unit.cpp
+2 -2
View File
@@ -141,9 +141,9 @@ void DamageInfo::BlockDamage(uint32 amount)
m_damage -= 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), :_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)
{ {
} }
src/server/game/Entities/Unit/Unit.h
-1
View File
@@ -938,7 +938,6 @@ private:
uint32 _spellPhaseMask; uint32 _spellPhaseMask;
uint32 _hitMask; uint32 _hitMask;
uint32 _cooldown; uint32 _cooldown;
Spell* _spell;
DamageInfo* _damageInfo; DamageInfo* _damageInfo;
HealInfo* _healInfo; HealInfo* _healInfo;
SpellInfo const* const _triggeredByAuraSpell; SpellInfo const* const _triggeredByAuraSpell;
src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
+2 -5
View File
@@ -1919,7 +1919,7 @@ class FlameLeviathanPursuedTargetSelector
}; };
public: public:
explicit FlameLeviathanPursuedTargetSelector(Unit* unit) : _me(unit) {}; explicit FlameLeviathanPursuedTargetSelector() {};
bool operator()(WorldObject* target) const bool operator()(WorldObject* target) const
{ {
@@ -1949,9 +1949,6 @@ class FlameLeviathanPursuedTargetSelector
return !playerFound; return !playerFound;
} }
private:
Unit const* _me;
}; };
class spell_pursue : public SpellScriptLoader class spell_pursue : public SpellScriptLoader
@@ -1965,7 +1962,7 @@ class spell_pursue : public SpellScriptLoader
void FilterTargets(std::list<WorldObject*>& targets) void FilterTargets(std::list<WorldObject*>& targets)
{ {
targets.remove_if(FlameLeviathanPursuedTargetSelector(GetCaster())); targets.remove_if(FlameLeviathanPursuedTargetSelector());
if (targets.empty()) if (targets.empty())
{ {
if (Creature* caster = GetCaster()->ToCreature()) if (Creature* caster = GetCaster()->ToCreature())