Warning fixes + compile fix after the merge
This commit is contained in:
@@ -814,6 +814,8 @@ void Object::GetUpdateFieldData(Player const* target, uint32*& flags, bool& isOw
|
||||
flags = CorpseUpdateFieldFlags;
|
||||
isOwner = ToCorpse()->GetOwnerGUID() == target->GetGUID();
|
||||
break;
|
||||
case TYPEID_OBJECT:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2576,6 +2576,7 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit* unit, uint32 effectMask, bool scaleA
|
||||
for (uint32 effectNumber = 0; effectNumber < MAX_SPELL_EFFECTS; ++effectNumber)
|
||||
{
|
||||
if (effectMask & (1 << effectNumber))
|
||||
{
|
||||
if (unit->IsImmunedToSpellEffect(m_spellInfo, effectNumber))
|
||||
effectMask &= ~(1 << effectNumber);
|
||||
else if (m_spellInfo->Effects[effectNumber].IsAura() && !m_spellInfo->IsPositiveEffect(effectNumber))
|
||||
@@ -2590,7 +2591,9 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit* unit, uint32 effectMask, bool scaleA
|
||||
returnVal = SPELL_MISS_RESIST;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!effectMask)
|
||||
return returnVal;
|
||||
|
||||
|
||||
@@ -247,10 +247,14 @@ bool SpellScript::TargetHook::CheckEffect(SpellInfo const* spellEntry, uint8 eff
|
||||
return !area;
|
||||
case TARGET_REFERENCE_TYPE_TARGET: // BOTH
|
||||
return true;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user