From a13fa7f8735a9c6ea7c1ffca86bcac42005bb60b Mon Sep 17 00:00:00 2001 From: freghar Date: Wed, 16 Dec 2009 15:31:05 +0100 Subject: [PATCH] [9006] Trailing whitespace cleaning Sorry for a (bit) delayed commit. Signed-off-by: freghar --- sql/mangos.sql | 2 +- sql/updates/8253_01_mangos_spell_chain.sql | 2 +- sql/updates/8253_02_mangos_spell_proc_event.sql | 12 ++++++------ sql/updates/8254_01_mangos_spell_proc_event.sql | 2 +- .../8294_01_mangos_playercreateinfo_action.sql | 2 +- sql/updates/8392_01_mangos_spell_proc_event.sql | 6 +++--- sql/updates/8392_02_mangos_spell_chain.sql | 2 +- sql/updates/8394_01_mangos_spell_proc_event.sql | 6 +++--- sql/updates/8402_01_characters_guild_eventlog.sql | 2 +- .../8402_02_characters_guild_bank_eventlog.sql | 2 +- sql/updates/8487_01_mangos_spell_bonus_data.sql | 2 +- .../8803_02_mangos_playercreateinfo_action.sql | 2 +- sql/updates/8992_01_mangos_spell_proc_event.sql | 2 +- src/game/Mail.cpp | 2 +- src/game/PoolManager.cpp | 2 +- src/game/Spell.cpp | 2 +- src/game/SpellAuras.cpp | 6 +++--- src/game/Unit.cpp | 8 ++++---- src/shared/revision_nr.h | 2 +- 19 files changed, 33 insertions(+), 33 deletions(-) diff --git a/sql/mangos.sql b/sql/mangos.sql index 0c0a533a8..b75677ffe 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -14085,7 +14085,7 @@ INSERT INTO `spell_bonus_data` VALUES (31803, 0, 0.0156, 0.03, 'Paladin - Holy Vengeance'), (2812, 0.07, 0, 0.07, 'Paladin - Holy Wrath'), (54158, 0.25, 0, 0, 'Paladin - Judgement'), -(31898, 0.18, 0, 0.11, 'Paladin - Judgement of Blood Enemy'), +(31898, 0.18, 0, 0.11, 'Paladin - Judgement of Blood Enemy'), (32220, 0.0594, 0, 0.0363,'Paladin - Judgement of Blood Self'), (20467, 0.25, 0, 0.16, 'Paladin - Judgement of Command'), (53733, 0, 0, 0, 'Paladin - Judgement of Corruption'), diff --git a/sql/updates/8253_01_mangos_spell_chain.sql b/sql/updates/8253_01_mangos_spell_chain.sql index 207a22381..54bfea2c5 100644 --- a/sql/updates/8253_01_mangos_spell_chain.sql +++ b/sql/updates/8253_01_mangos_spell_chain.sql @@ -1,6 +1,6 @@ ALTER TABLE db_version CHANGE COLUMN required_8251_03_mangos_spell_proc_event required_8253_01_mangos_spell_chain bit; -DELETE FROM `spell_chain` WHERE `spell_id` IN (32385,32387,32392,32393,32394,51528,51529,51530,51531,51532); +DELETE FROM `spell_chain` WHERE `spell_id` IN (32385,32387,32392,32393,32394,51528,51529,51530,51531,51532); INSERT INTO `spell_chain` (`spell_id`, `prev_spell`, `first_spell`, `rank`, `req_spell`) VALUES /*Shadow embrace*/ (32385,0,32385,1,0), diff --git a/sql/updates/8253_02_mangos_spell_proc_event.sql b/sql/updates/8253_02_mangos_spell_proc_event.sql index 8e3472cbc..6d490be0b 100644 --- a/sql/updates/8253_02_mangos_spell_proc_event.sql +++ b/sql/updates/8253_02_mangos_spell_proc_event.sql @@ -6,16 +6,16 @@ INSERT INTO spell_proc_event VALUES (60442, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45); /*Seal of wisdom*/ -DELETE FROM `spell_proc_event` WHERE `entry` IN (20166); +DELETE FROM `spell_proc_event` WHERE `entry` IN (20166); INSERT INTO `spell_proc_event` VALUES -(20166, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,15.000000, 0.000000, 0); +(20166, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,15.000000, 0.000000, 0); /*Shadow embrace*/ -DELETE FROM `spell_proc_event` WHERE `entry` IN (32385); +DELETE FROM `spell_proc_event` WHERE `entry` IN (32385); INSERT INTO `spell_proc_event` VALUES -(32385, 0x00000000, 5, 0x00000001, 0x00040000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0); +(32385, 0x00000000, 5, 0x00000001, 0x00040000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0); /*Maelstrom Weapon*/ -DELETE FROM `spell_proc_event` WHERE `entry` IN (51528); +DELETE FROM `spell_proc_event` WHERE `entry` IN (51528); INSERT INTO `spell_proc_event` VALUES -(51528, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,12.500000, 0.000000, 0); +(51528, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,12.500000, 0.000000, 0); diff --git a/sql/updates/8254_01_mangos_spell_proc_event.sql b/sql/updates/8254_01_mangos_spell_proc_event.sql index 9be248781..66d33f707 100644 --- a/sql/updates/8254_01_mangos_spell_proc_event.sql +++ b/sql/updates/8254_01_mangos_spell_proc_event.sql @@ -1,6 +1,6 @@ ALTER TABLE db_version CHANGE COLUMN required_8253_02_mangos_spell_proc_event required_8254_01_mangos_spell_proc_event bit; -DELETE FROM `spell_proc_event` WHERE `entry` IN (55747,60436); +DELETE FROM `spell_proc_event` WHERE `entry` IN (55747,60436); INSERT INTO `spell_proc_event` VALUES (55747, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45), (60436, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45); diff --git a/sql/updates/8294_01_mangos_playercreateinfo_action.sql b/sql/updates/8294_01_mangos_playercreateinfo_action.sql index 802f3ab4f..ed58c65e7 100644 --- a/sql/updates/8294_01_mangos_playercreateinfo_action.sql +++ b/sql/updates/8294_01_mangos_playercreateinfo_action.sql @@ -41,7 +41,7 @@ INSERT INTO playercreateinfo_action VALUES DELETE FROM playercreateinfo_action WHERE race=2 AND class=3 AND button IN (4,9); INSERT INTO playercreateinfo_action VALUES (2,3,9,20572,0); --- Moved Berserking to correct action bar location for Non-Heroic Troll classes +-- Moved Berserking to correct action bar location for Non-Heroic Troll classes DELETE FROM playercreateinfo_action WHERE race=8 AND class IN (3,5,7,8) AND button IN (3,76); INSERT INTO playercreateinfo_action VALUES (8,3,3,20554,0), diff --git a/sql/updates/8392_01_mangos_spell_proc_event.sql b/sql/updates/8392_01_mangos_spell_proc_event.sql index 39a7cc17b..01e3e2633 100644 --- a/sql/updates/8392_01_mangos_spell_proc_event.sql +++ b/sql/updates/8392_01_mangos_spell_proc_event.sql @@ -1,5 +1,5 @@ ALTER TABLE db_version CHANGE COLUMN required_8377_01_mangos_spell_area required_8392_01_mangos_spell_proc_event bit; -DELETE FROM `spell_proc_event` WHERE `entry` IN (47569); -INSERT INTO `spell_proc_event` VALUES -(47569, 0x00000000, 6, 0x00004000, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0.000000, 0.000000, 0); +DELETE FROM `spell_proc_event` WHERE `entry` IN (47569); +INSERT INTO `spell_proc_event` VALUES +(47569, 0x00000000, 6, 0x00004000, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0.000000, 0.000000, 0); diff --git a/sql/updates/8392_02_mangos_spell_chain.sql b/sql/updates/8392_02_mangos_spell_chain.sql index efab4d1ea..b42519c95 100644 --- a/sql/updates/8392_02_mangos_spell_chain.sql +++ b/sql/updates/8392_02_mangos_spell_chain.sql @@ -1,6 +1,6 @@ ALTER TABLE db_version CHANGE COLUMN required_8392_01_mangos_spell_proc_event required_8392_02_mangos_spell_chain bit; -DELETE FROM `spell_chain` WHERE `spell_id` IN (47569,47570); +DELETE FROM `spell_chain` WHERE `spell_id` IN (47569,47570); INSERT INTO `spell_chain` (`spell_id`, `prev_spell`, `first_spell`, `rank`, `req_spell`) VALUES /*Improved Shadowform*/ (47569,0,47569,1,0), diff --git a/sql/updates/8394_01_mangos_spell_proc_event.sql b/sql/updates/8394_01_mangos_spell_proc_event.sql index 73afa3da5..41fbcd0f2 100644 --- a/sql/updates/8394_01_mangos_spell_proc_event.sql +++ b/sql/updates/8394_01_mangos_spell_proc_event.sql @@ -1,5 +1,5 @@ ALTER TABLE db_version CHANGE COLUMN required_8392_02_mangos_spell_chain required_8394_01_mangos_spell_proc_event bit; -DELETE FROM `spell_proc_event` WHERE `entry` IN (54646); -INSERT INTO `spell_proc_event` VALUES -(54646, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00015400, 0x00000002, 0.000000, 0.000000, 0); +DELETE FROM `spell_proc_event` WHERE `entry` IN (54646); +INSERT INTO `spell_proc_event` VALUES +(54646, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00015400, 0x00000002, 0.000000, 0.000000, 0); diff --git a/sql/updates/8402_01_characters_guild_eventlog.sql b/sql/updates/8402_01_characters_guild_eventlog.sql index 107639d39..10ee6c9f4 100644 --- a/sql/updates/8402_01_characters_guild_eventlog.sql +++ b/sql/updates/8402_01_characters_guild_eventlog.sql @@ -15,6 +15,6 @@ CREATE TABLE `guild_eventlog` ( PRIMARY KEY (`guildid`, `LogGuid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT 'Guild Eventlog'; --- The reason i decided for such dramatic change is that old guild_eventlog table didn't have Primary key and +-- The reason i decided for such dramatic change is that old guild_eventlog table didn't have Primary key and -- used LogGuids from 0 to infinity -- New system uses LogGuids from 0 to number defined in config. diff --git a/sql/updates/8402_02_characters_guild_bank_eventlog.sql b/sql/updates/8402_02_characters_guild_bank_eventlog.sql index 0cee36c4c..4782111a2 100644 --- a/sql/updates/8402_02_characters_guild_bank_eventlog.sql +++ b/sql/updates/8402_02_characters_guild_bank_eventlog.sql @@ -18,6 +18,6 @@ CREATE TABLE `guild_bank_eventlog` ( KEY `guildid_key` (`guildid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; --- The reason i decided for such dramatic change is that old guild_bank_eventlog table used `TabId` = 0 for Money events and +-- The reason i decided for such dramatic change is that old guild_bank_eventlog table used `TabId` = 0 for Money events and -- used `LogGuid` from 0 to infinity -- New system uses `LogGuid` from 0 to number defined in config. diff --git a/sql/updates/8487_01_mangos_spell_bonus_data.sql b/sql/updates/8487_01_mangos_spell_bonus_data.sql index 880f4773b..ecd2e7fac 100644 --- a/sql/updates/8487_01_mangos_spell_bonus_data.sql +++ b/sql/updates/8487_01_mangos_spell_bonus_data.sql @@ -12,7 +12,7 @@ INSERT INTO `spell_bonus_data` VALUES (53733, 0, 0, 0, "Paladin - Judgement of Corruption"), (31893, 0, 0, 0, "Paladin - Seal of Blood Proc Enemy"), (32221, 0, 0, 0, "Paladin - Seal of Blood Proc Self"), -(31898, 0.18, 0, 0.11, "Paladin - Judgement of Blood Enemy"), +(31898, 0.18, 0, 0.11, "Paladin - Judgement of Blood Enemy"), (32220, 0.0594, 0, 0.0363, "Paladin - Judgement of Blood Self"), (53719, 0, 0, 0, "Paladin - Seal of the Martyr Proc Enemy"), (53718, 0, 0, 0, "Paladin - Seal of the Martyr Proc Self"), diff --git a/sql/updates/8803_02_mangos_playercreateinfo_action.sql b/sql/updates/8803_02_mangos_playercreateinfo_action.sql index 077d4d29d..de2ce0d01 100644 --- a/sql/updates/8803_02_mangos_playercreateinfo_action.sql +++ b/sql/updates/8803_02_mangos_playercreateinfo_action.sql @@ -1,5 +1,5 @@ ALTER TABLE db_version CHANGE COLUMN required_8803_01_mangos_playercreateinfo_spell required_8803_02_mangos_playercreateinfo_action bit; -UPDATE `playercreateinfo_action` +UPDATE `playercreateinfo_action` SET `action` = 26297 WHERE `action` IN (20554,26296,50621) AND `type` = 0; diff --git a/sql/updates/8992_01_mangos_spell_proc_event.sql b/sql/updates/8992_01_mangos_spell_proc_event.sql index 0a1c795b2..a049ac01b 100644 --- a/sql/updates/8992_01_mangos_spell_proc_event.sql +++ b/sql/updates/8992_01_mangos_spell_proc_event.sql @@ -7,7 +7,7 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell /*Frenzy*/ DELETE FROM `spell_proc_event` WHERE `entry` IN (20784); -INSERT INTO `spell_proc_event` (`entry` ,`SchoolMask` ,`SpellFamilyName` ,`SpellFamilyMask0` ,`SpellFamilyMask1` ,`SpellFamilyMask2` ,`procFlags` ,`procEx` ,`ppmRate` ,`CustomChance` ,`Cooldown`)VALUES +INSERT INTO `spell_proc_event` (`entry` ,`SchoolMask` ,`SpellFamilyName` ,`SpellFamilyMask0` ,`SpellFamilyMask1` ,`SpellFamilyMask2` ,`procFlags` ,`procEx` ,`ppmRate` ,`CustomChance` ,`Cooldown`)VALUES (20784, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0); /*Master Tactician*/ diff --git a/src/game/Mail.cpp b/src/game/Mail.cpp index 290341432..553a2ebba 100644 --- a/src/game/Mail.cpp +++ b/src/game/Mail.cpp @@ -914,7 +914,7 @@ void MailDraft::SendReturnToSender(uint32 sender_acc, uint32 sender_guid, uint32 void MailDraft::SendMailTo(MailReceiver const& receiver, MailSender const& sender, MailCheckMask checked, uint32 deliver_delay) { Player* pReceiver = receiver.GetPlayer(); // can be NULL - + if (pReceiver) prepareItems(pReceiver); // generate mail template items diff --git a/src/game/PoolManager.cpp b/src/game/PoolManager.cpp index f1c41ca11..28093b14a 100644 --- a/src/game/PoolManager.cpp +++ b/src/game/PoolManager.cpp @@ -202,7 +202,7 @@ void PoolGroup::SpawnObject(uint32 limit, uint32 triggerFrom) int count = limit - m_SpawnedPoolAmount; // If triggered from some object respawn this object is still marked as spawned - // and also counted into m_SpawnedPoolAmount so we need increase count to be + // and also counted into m_SpawnedPoolAmount so we need increase count to be // spawned by 1 if (triggerFrom) ++count; diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 6467ff854..500f529d5 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -4320,7 +4320,7 @@ SpellCastResult Spell::CheckCast(bool strict) return SPELL_FAILED_BAD_IMPLICIT_TARGETS; Pet* target = m_caster->GetMap()->GetPet(((Player*)m_caster)->GetSelection()); - // alive + // alive if (!target || target->isDead()) return SPELL_FAILED_BAD_IMPLICIT_TARGETS; // undead diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 186d53825..f559e175e 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -2572,7 +2572,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real) break; case SPELLFAMILY_WARLOCK: { - // Haunt + // Haunt if (GetSpellProto()->SpellIconID == 3172 && (GetSpellProto()->SpellFamilyFlags & UI64LIT(0x0004000000000000))) { // NOTE: for avoid use additional field damage stored in dummy value (replace unused 100% @@ -5915,7 +5915,7 @@ void Aura::HandleSpellSpecificBoosts(bool apply) case SPELLFAMILY_MAGE: { // Ice Barrier (non stacking from one caster) - if (m_spellProto->SpellIconID == 32) + if (m_spellProto->SpellIconID == 32) { if (!apply && (m_removeMode == AURA_REMOVE_BY_DISPEL || (m_removeMode == AURA_REMOVE_BY_DEFAULT && !GetModifier()->m_amount))) { @@ -6010,7 +6010,7 @@ void Aura::HandleSpellSpecificBoosts(bool apply) for(Unit::AuraList::const_iterator itr = dummyAuras.begin(); itr != dummyAuras.end(); ++itr) { // Shadow Affinity - if ((*itr)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_PRIEST + if ((*itr)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_PRIEST && (*itr)->GetSpellProto()->SpellIconID == 178) { // custom cast code diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index df4fc9efc..b1a5d84d2 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -6253,7 +6253,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu break; } // Sacred Shield (talent rank) - case 53601: + case 53601: { triggered_spell_id = 58597; target = this; @@ -8983,7 +8983,7 @@ bool Unit::isSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolM // Lava Burst if (spellProto->SpellFamilyFlags & UI64LIT(0x0000100000000000)) { - // Flame Shock + // Flame Shock if (Aura *flameShock = pVictim->GetAura(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_SHAMAN, UI64LIT(0x0000000010000000), 0, GetGUID())) return true; } @@ -10817,7 +10817,7 @@ int32 Unit::CalculateSpellDuration(SpellEntry const* spellProto, uint8 effect_in durationMod_always+=target->GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_DURATION_OF_EFFECTS_BY_DISPEL, spellProto->Dispel); // Find max mod (negative bonus) int32 durationMod_not_stack = target->GetMaxNegativeAuraModifierByMiscValue(SPELL_AURA_MECHANIC_DURATION_MOD_NOT_STACK, mechanic); - + if (!IsPositiveSpell(spellProto->Id)) durationMod_always += target->GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_DURATION_OF_MAGIC_EFFECTS, spellProto->DmgClass); @@ -13045,4 +13045,4 @@ void Unit::CleanupDeletedAuars() for(AuraList::const_iterator itr = m_deletedAuras.begin(); itr != m_deletedAuras.end(); ++itr) delete *itr; m_deletedAuras.clear(); -} \ No newline at end of file +} diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 2f9e0166c..7d88b402d 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9005" + #define REVISION_NR "9006" #endif // __REVISION_NR_H__