Core: Fix warnings
This commit is contained in:
1 parent
fbddda52e7
commit
955fb907c5
4 files changed
+23
-21
No files matched your search
@@ -2634,38 +2634,38 @@ void Player::RegenerateHealth()
|
||||
if (getLevel() < 15)
|
||||
HealthIncreaseRate = sWorld->getRate(RATE_HEALTH) * (2.066f - (getLevel() * 0.066f));
|
||||
|
||||
float addvalue = 0.0f;
|
||||
float addValue = 0.0f;
|
||||
|
||||
// polymorphed case
|
||||
if (IsPolymorphed())
|
||||
addvalue = (float)GetMaxHealth()/3;
|
||||
addValue = float(GetMaxHealth()) / 3.0f;
|
||||
// normal regen case (maybe partly in combat case)
|
||||
else if (!IsInCombat() || HasAuraType(SPELL_AURA_MOD_REGEN_DURING_COMBAT))
|
||||
{
|
||||
addvalue = OCTRegenHPPerSpirit() * HealthIncreaseRate;
|
||||
addValue = OCTRegenHPPerSpirit() * HealthIncreaseRate;
|
||||
if (!IsInCombat())
|
||||
{
|
||||
AuraEffectList const& mModHealthRegenPct = GetAuraEffectsByType(SPELL_AURA_MOD_HEALTH_REGEN_PERCENT);
|
||||
for (AuraEffectList::const_iterator i = mModHealthRegenPct.begin(); i != mModHealthRegenPct.end(); ++i)
|
||||
AddPct(addvalue, (*i)->GetAmount());
|
||||
AddPct(addValue, (*i)->GetAmount());
|
||||
|
||||
addvalue += GetTotalAuraModifier(SPELL_AURA_MOD_REGEN) * 2 * IN_MILLISECONDS / (5 * IN_MILLISECONDS);
|
||||
addValue += GetTotalAuraModifier(SPELL_AURA_MOD_REGEN) * 0.4f;
|
||||
}
|
||||
else if (HasAuraType(SPELL_AURA_MOD_REGEN_DURING_COMBAT))
|
||||
ApplyPct(addvalue, GetTotalAuraModifier(SPELL_AURA_MOD_REGEN_DURING_COMBAT));
|
||||
ApplyPct(addValue, GetTotalAuraModifier(SPELL_AURA_MOD_REGEN_DURING_COMBAT));
|
||||
|
||||
if (!IsStandState())
|
||||
addvalue *= 1.5f;
|
||||
addValue *= 1.5f;
|
||||
}
|
||||
|
||||
// always regeneration bonus (including combat)
|
||||
addvalue += GetTotalAuraModifier(SPELL_AURA_MOD_HEALTH_REGEN_IN_COMBAT);
|
||||
addvalue += m_baseHealthRegen / 2.5f;
|
||||
addValue += GetTotalAuraModifier(SPELL_AURA_MOD_HEALTH_REGEN_IN_COMBAT);
|
||||
addValue += m_baseHealthRegen / 2.5f;
|
||||
|
||||
if (addvalue < 0)
|
||||
addvalue = 0;
|
||||
if (addValue < 0.0f)
|
||||
addValue = 0.0f;
|
||||
|
||||
ModifyHealth(int32(addvalue));
|
||||
ModifyHealth(int32(addValue));
|
||||
}
|
||||
|
||||
void Player::ResetAllPowers()
|
||||
|
||||
@@ -17445,19 +17445,21 @@ bool Unit::SetHover(bool enable, bool /*packetOnly = false*/)
|
||||
if (enable == HasUnitMovementFlag(MOVEMENTFLAG_HOVER))
|
||||
return false;
|
||||
|
||||
float hoverHeight = GetFloatValue(UNIT_FIELD_HOVERHEIGHT);
|
||||
|
||||
if (enable)
|
||||
{
|
||||
//! No need to check height on ascent
|
||||
AddUnitMovementFlag(MOVEMENTFLAG_HOVER);
|
||||
if (float hh = GetFloatValue(UNIT_FIELD_HOVERHEIGHT))
|
||||
UpdateHeight(GetPositionZ() + hh);
|
||||
if (hoverHeight)
|
||||
UpdateHeight(GetPositionZ() + hoverHeight);
|
||||
}
|
||||
else
|
||||
{
|
||||
RemoveUnitMovementFlag(MOVEMENTFLAG_HOVER);
|
||||
if (float hh = GetFloatValue(UNIT_FIELD_HOVERHEIGHT))
|
||||
if (hoverHeight)
|
||||
{
|
||||
float newZ = GetPositionZ() - hh;
|
||||
float newZ = GetPositionZ() - hoverHeight;
|
||||
UpdateAllowedPositionZ(GetPositionX(), GetPositionY(), newZ);
|
||||
UpdateHeight(newZ);
|
||||
}
|
||||
|
||||
@@ -140,13 +140,13 @@ class spell_dk_anti_magic_shell_self : public SpellScriptLoader
|
||||
absorbAmount = std::min(CalculatePct(dmgInfo.GetDamage(), absorbPct), GetTarget()->CountPctFromMaxHealth(hpPct));
|
||||
}
|
||||
|
||||
void Trigger(AuraEffect* aurEff, DamageInfo & /*dmgInfo*/, uint32 & absorbAmount)
|
||||
void Trigger(AuraEffect* aurEff, DamageInfo& /*dmgInfo*/, uint32& absorbAmount)
|
||||
{
|
||||
Unit* target = GetTarget();
|
||||
// damage absorbed by Anti-Magic Shell energizes the DK with additional runic power.
|
||||
// This, if I'm not mistaken, shows that we get back ~20% of the absorbed damage as runic power.
|
||||
int32 bp = absorbAmount * 2 / 10;
|
||||
target->CastCustomSpell(target, SPELL_DK_RUNIC_POWER_ENERGIZE, &bp, NULL, NULL, true, NULL, aurEff);
|
||||
absorbAmount = absorbAmount * 2 / 10;
|
||||
|
||||
GetTarget()->CastCustomSpell(SPELL_DK_RUNIC_POWER_ENERGIZE, SPELLVALUE_BASE_POINT0, absorbAmount, GetTarget(), true, NULL, aurEff);
|
||||
}
|
||||
|
||||
void Register() OVERRIDE
|
||||
|
||||
@@ -1033,7 +1033,7 @@ class spell_dru_wild_growth : public SpellScriptLoader
|
||||
|
||||
int32 const maxTargets = GetSpellInfo()->Effects[EFFECT_2].CalcValue(GetCaster());
|
||||
|
||||
if (targets.size() > maxTargets)
|
||||
if (targets.size() > uint32(maxTargets))
|
||||
{
|
||||
targets.sort(Trinity::HealthPctOrderPred());
|
||||
targets.resize(maxTargets);
|
||||
|
||||
Reference in new issue
Block a user