server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some fixes to make clang happier

Browse Source
This commit is contained in:
namreev 2016-09-09 11:07:58 +01:00 committed by Antz
parent cd47bb96e0
commit df6e0719ec
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/Object/SpellMgr.cpp
View File

@ -2527,8 +2527,8 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
{ return false; } { return false; }
// Omen of Clarity and Blood Frenzy // Omen of Clarity and Blood Frenzy
if (((spellInfo_1->SpellFamilyFlags == UI64LIT(0x0) && spellInfo_1->SpellIconID == 108) && (spellInfo_2->SpellFamilyFlags & UI64LIT(0x20000000000000))) || if (((!spellInfo_1->SpellFamilyFlags && spellInfo_1->SpellIconID == 108) && (spellInfo_2->SpellFamilyFlags & UI64LIT(0x20000000000000))) ||
((spellInfo_2->SpellFamilyFlags == UI64LIT(0x0) && spellInfo_2->SpellIconID == 108) && (spellInfo_1->SpellFamilyFlags & UI64LIT(0x20000000000000)))) ((!spellInfo_2->SpellFamilyFlags && spellInfo_2->SpellIconID == 108) && (spellInfo_1->SpellFamilyFlags & UI64LIT(0x20000000000000))))
{ return false; } { return false; }
break; break;

2
src/game/WorldHandlers/SpellAuras.cpp
View File

@ -4302,7 +4302,7 @@ void Aura::HandleSchoolAbsorb(bool apply, bool Real)
break; break;
case SPELLFAMILY_WARLOCK: case SPELLFAMILY_WARLOCK:
// Shadow Ward // Shadow Ward
if (spellProto->SpellFamilyFlags == UI64LIT(0x00)) if (!spellProto->SpellFamilyFlags)
//+10% from +spell bonus //+10% from +spell bonus
{ DoneActualBenefit = caster->SpellBaseDamageBonusDone(GetSpellSchoolMask(spellProto)) * 0.1f; } { DoneActualBenefit = caster->SpellBaseDamageBonusDone(GetSpellSchoolMask(spellProto)) * 0.1f; }
break; break;

2
src/game/WorldHandlers/UnitAuraProcHandler.cpp
View File

@ -956,7 +956,7 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit* pVictim, uint32 d
break; break;
case SPELLFAMILY_WARRIOR: case SPELLFAMILY_WARRIOR:
// Deep Wounds (replace triggered spells to directly apply DoT), dot spell have familyflags // Deep Wounds (replace triggered spells to directly apply DoT), dot spell have familyflags
if (auraSpellInfo->SpellFamilyFlags == UI64LIT(0x0) && auraSpellInfo->SpellIconID == 243) if (!auraSpellInfo->SpellFamilyFlags && auraSpellInfo->SpellIconID == 243)
{ {
float weaponDamage; float weaponDamage;
// DW should benefit of attack power, damage percent mods etc. // DW should benefit of attack power, damage percent mods etc.