Core: Remove again whitespace (meh :/)

This commit is contained in:
Vincent-Michael
2014-09-07 04:06:50 +02:00
parent c585ce5b3c
commit c7e1eae2ce
11 changed files with 20 additions and 21 deletions
+3 -3
View File
@@ -5888,7 +5888,7 @@ void Player::ApplyRatingMod(CombatRating combatRating, int32 value, bool apply)
{
float oldRating = m_baseRatingValue[combatRating];
m_baseRatingValue[combatRating] += (apply ? value : -value);
// explicit affected values
float const multiplier = GetRatingMultiplier(combatRating);
float const oldVal = oldRating * multiplier;
@@ -26493,13 +26493,13 @@ void Player::SendItemRetrievalMail(uint32 itemEntry, uint32 count)
MailSender sender(MAIL_CREATURE, 34337 /* The Postmaster */);
MailDraft draft("Recovered Item", "We recovered a lost item in the twisting nether and noted that it was yours.$B$BPlease find said object enclosed."); // This is the text used in Cataclysm, it probably wasn't changed.
SQLTransaction trans = CharacterDatabase.BeginTransaction();
if (Item* item = Item::CreateItem(itemEntry, count, 0))
{
item->SaveToDB(trans);
draft.AddItem(item);
}
draft.SendMailTo(trans, MailReceiver(this, GetGUIDLow()), sender);
CharacterDatabase.CommitTransaction(trans);
}
+1 -1
View File
@@ -6449,7 +6449,7 @@ bool Spell::CheckEffectTarget(Unit const* target, uint32 eff, Position const* lo
// check for ignore LOS on the effect itself
if (m_spellInfo->AttributesEx2 & SPELL_ATTR2_CAN_TARGET_NOT_IN_LOS || DisableMgr::IsDisabledFor(DISABLE_TYPE_SPELL, m_spellInfo->Id, NULL, SPELL_DISABLE_LOS))
return true;
// if spell is triggered, need to check for LOS disable on the aura triggering it and inherit that behaviour
if (IsTriggered() && m_triggeredByAuraSpell && (m_triggeredByAuraSpell->AttributesEx2 & SPELL_ATTR2_CAN_TARGET_NOT_IN_LOS || DisableMgr::IsDisabledFor(DISABLE_TYPE_SPELL, m_triggeredByAuraSpell->Id, NULL, SPELL_DISABLE_LOS)))
return true;
+1 -1
View File
@@ -239,7 +239,7 @@ public:
ticket->SetCompleted();
ticket->SaveToDB(trans);
std::string msg = ticket->FormatMessageString(*handler, NULL, NULL,
std::string msg = ticket->FormatMessageString(*handler, NULL, NULL,
NULL, NULL, handler->GetSession() ? handler->GetSession()->GetPlayer()->GetName().c_str() : "Console");
handler->SendGlobalGMSysMessage(msg.c_str());
sTicketMgr->UpdateLastChange();
@@ -412,7 +412,7 @@ class npc_eye_of_acherus : public CreatureScript
{
if (movementType == WAYPOINT_MOTION_TYPE && pointId == POINT_EYE_MOVE_END - 1)
{
me->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE);
me->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE);
me->RemoveAllAuras();
if (Player* owner = me->GetCharmerOrOwner()->ToPlayer())
@@ -105,7 +105,7 @@ public:
DoMeleeAttackIfReady();
}
private:
EventMap events;
SummonList Summons;
@@ -151,18 +151,17 @@ class spell_kormok_summon_bone_mages : SpellScriptLoader
bool Validate(SpellInfo const* /*spell*/) override
{
for (int i = 0; i < 4; ++i)
for (uint32 i = 0; i < 4; ++i)
if (!sSpellMgr->GetSpellInfo(SummonMageSpells[i]))
return false;
return true;
return true;
}
void HandleScript(SpellEffIndex effIndex)
{
PreventHitDefaultEffect(effIndex);
for (int i = 0; i < 2; ++i)
GetCaster()->CastSpell(GetCaster(), SummonMageSpells[urand(0, 4)], true);
for (uint32 i = 0; i < 2; ++i)
GetCaster()->CastSpell(GetCaster(), SummonMageSpells[urand(0, 4)], true);
}
void Register() override
@@ -199,7 +198,7 @@ class spell_kormok_summon_bone_minions : SpellScriptLoader
PreventHitDefaultEffect(effIndex);
// Possible spells to handle this not found.
for (int i = 0; i < 4; ++i)
for (uint32 i = 0; i < 4; ++i)
GetCaster()->SummonCreature(NPC_BONE_MINION, GetCaster()->GetPositionX() + float(irand(-7, 7)), GetCaster()->GetPositionY() + float(irand(-7, 7)), GetCaster()->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000);
}
@@ -53,8 +53,8 @@ public:
DoCast(me, SPELL_ICE_ARMOR);
}
void EnterCombat(Unit* /*who*/) override
{
void EnterCombat(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_ICE_ARMOR, 2000);
events.ScheduleEvent(EVENT_FROSTBOLT, 8000);
events.ScheduleEvent(EVENT_CHILL_NOVA, 12000);
@@ -108,7 +108,7 @@ public:
DoMeleeAttackIfReady();
}
private:
EventMap events;
};
@@ -101,7 +101,7 @@ public:
DoMeleeAttackIfReady();
}
private:
EventMap events;
};
@@ -204,7 +204,7 @@ public:
default:
break;
}
++BeamCount;
uint32 Beam = CurrentBeam;
if (BeamCount > 3)
@@ -265,7 +265,7 @@ public:
break;
}
}
private:
uint64 TargetGUID[3];
uint32 BeamCount;
@@ -179,7 +179,7 @@ public:
break;
}
}
private:
uint64 SpineTargetGUID;
};
@@ -587,7 +587,7 @@ class boss_taerar : public CreatureScript
void Reset() override
{
me->RemoveAurasDueToSpell(SPELL_SHADE);
Initialize();
emerald_dragonAI::Reset();