From 0159e1cc7247af0b2b7a37c75f11bcc2d54ed512 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Sun, 12 Mar 2017 16:42:26 -0500 Subject: [PATCH] Fix some crapped out formatting [skip ci] --- zone/attack.cpp | 8 ++++---- zone/spells.cpp | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/zone/attack.cpp b/zone/attack.cpp index 7f5efa933..38e8bed34 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -4132,13 +4132,13 @@ void Mob::TryCriticalHit(Mob *defender, DamageHitInfo &hit, ExtraAttackOptions * hit.damage_done = hit.damage_done * 200 / 100; entity_list.FilteredMessageClose_StringID( - this, /* Sender */ + this, /* Sender */ false, /* Skip Sender */ RuleI(Range, CriticalDamage), MT_CritMelee, /* Type: 301 */ FilterMeleeCrits, /* FilterType: 12 */ DEADLY_STRIKE, /* MessageFormat: %1 scores a Deadly Strike!(%2) */ - GetCleanName(), /* Message1 */ + GetCleanName(), /* Message1 */ itoa(hit.damage_done + hit.min_damage) /* Message2 */ ); return; @@ -4160,14 +4160,14 @@ void Mob::TryCriticalHit(Mob *defender, DamageHitInfo &hit, ExtraAttackOptions * Log.Out(Logs::Detail, Logs::Combat, "Crip damage %d", hit.damage_done); entity_list.FilteredMessageClose_StringID( - this, /* Sender */ + this, /* Sender */ false, /* Skip Sender */ RuleI(Range, CriticalDamage), MT_CritMelee, /* Type: 301 */ FilterMeleeCrits, /* FilterType: 12 */ CRIPPLING_BLOW, /* MessageFormat: %1 lands a Crippling Blow!(%2) */ GetCleanName(), /* Message1 */ - itoa(hit.damage_done + hit.min_damage) /* Message2 */ + itoa(hit.damage_done + hit.min_damage) /* Message2 */ ); // Crippling blows also have a chance to stun diff --git a/zone/spells.cpp b/zone/spells.cpp index 60ca016ff..af09c14a3 100644 --- a/zone/spells.cpp +++ b/zone/spells.cpp @@ -366,17 +366,17 @@ bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot, /* Song Failure Messages */ entity_list.FilteredMessageClose_StringID( - this, /* Sender */ + this, /* Sender */ true, /* Skip Sender */ RuleI(Range, SpellMessages), MT_SpellFailure, /* Type: 289 */ (IsClient() ? FilterPCSpells : FilterNPCSpells), /* FilterType: 8 or 9 depending on client/npc */ - (fizzle_msg == MISS_NOTE ? MISSED_NOTE_OTHER : SPELL_FIZZLE_OTHER), - /* - MessageFormat: You miss a note, bringing your song to a close! (if missed note) - MessageFormat: A missed note brings %1's song to a close! - MessageFormat: %1's spell fizzles! - */ + (fizzle_msg == MISS_NOTE ? MISSED_NOTE_OTHER : SPELL_FIZZLE_OTHER), + /* + MessageFormat: You miss a note, bringing your song to a close! (if missed note) + MessageFormat: A missed note brings %1's song to a close! + MessageFormat: %1's spell fizzles! + */ GetName() /* Message1 */ );