Core/Misc: Some random cleanups and code style fixes
This commit is contained in:
@@ -992,7 +992,7 @@ void Unit::CalculateSpellDamageTaken(SpellNonMeleeDamage *damageInfo, int32 dama
|
||||
return;
|
||||
}
|
||||
|
||||
Unit *pVictim = damageInfo->target;
|
||||
Unit* pVictim = damageInfo->target;
|
||||
if (!pVictim || !pVictim->isAlive())
|
||||
return;
|
||||
|
||||
@@ -1095,7 +1095,7 @@ void Unit::DealSpellDamage(SpellNonMeleeDamage *damageInfo, bool durabilityLoss)
|
||||
if (damageInfo == 0)
|
||||
return;
|
||||
|
||||
Unit *pVictim = damageInfo->target;
|
||||
Unit* pVictim = damageInfo->target;
|
||||
|
||||
if (!pVictim)
|
||||
return;
|
||||
@@ -1325,7 +1325,7 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da
|
||||
|
||||
void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss)
|
||||
{
|
||||
Unit *pVictim = damageInfo->target;
|
||||
Unit* pVictim = damageInfo->target;
|
||||
|
||||
if (!pVictim->isAlive() || pVictim->HasUnitState(UNIT_STAT_IN_FLIGHT) || (pVictim->HasUnitState(UNIT_STAT_ONVEHICLE) && pVictim->GetVehicleBase() != this) || (pVictim->GetTypeId() == TYPEID_UNIT && pVictim->ToCreature()->IsInEvadeMode()))
|
||||
return;
|
||||
@@ -5716,7 +5716,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
|
||||
return true;
|
||||
// Crititcal counted -> roll chance
|
||||
if (roll_chance_i(triggerAmount))
|
||||
CastSpell(this, 48108, true, castItem, triggeredByAura);
|
||||
CastSpell(this, 48108, true, castItem, triggeredByAura);
|
||||
}
|
||||
counter->SetAmount(25);
|
||||
return true;
|
||||
@@ -16759,7 +16759,7 @@ bool Unit::HandleSpellClick(Unit* clicker, int8 seatId)
|
||||
{
|
||||
if (itr->second.IsFitToRequirements(clicker, this))
|
||||
{
|
||||
Unit *caster = (itr->second.castFlags & NPC_CLICK_CAST_CASTER_CLICKER) ? clicker : this;
|
||||
Unit* caster = (itr->second.castFlags & NPC_CLICK_CAST_CASTER_CLICKER) ? clicker : this;
|
||||
Unit* target = (itr->second.castFlags & NPC_CLICK_CAST_TARGET_CLICKER) ? clicker : this;
|
||||
uint64 origCasterGUID = (itr->second.castFlags & NPC_CLICK_CAST_ORIG_CASTER_OWNER) ? GetOwnerGUID() : clicker->GetGUID();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user