From aec45a8d62a782568f56e61168c039b48a49ee4f Mon Sep 17 00:00:00 2001 From: freghar Date: Thu, 22 Jan 2009 18:09:34 +0100 Subject: [PATCH] [7146] Trailing whitespace code cleanup Signed-off-by: freghar --- sql/updates/6958_01_mangos_spell_proc_event.sql | 4 ++-- sql/updates/7044_01_mangos_spell_proc_event.sql | 2 +- sql/updates/7075_01_characters_character_spell.sql | 2 +- sql/updates/7078_01_mangos_spell_proc_event.sql | 2 +- sql/updates/README | 4 ++-- src/game/CalendarHandler.cpp | 2 +- src/game/CharacterHandler.cpp | 2 +- src/game/GameObject.h | 2 +- src/game/Guild.cpp | 4 ++-- src/game/Object.cpp | 2 +- src/game/Player.cpp | 12 ++++++------ src/game/Player.h | 2 +- src/game/Spell.cpp | 2 +- src/game/SpellAuras.cpp | 12 ++++++------ src/game/SpellAuras.h | 4 ++-- src/game/SpellEffects.cpp | 16 ++++++++-------- src/game/SpellMgr.cpp | 6 +++--- src/game/Unit.cpp | 10 +++++----- src/game/Unit.h | 2 +- src/game/WorldSession.cpp | 2 +- src/shared/Database/DBCStores.cpp | 10 +++++----- src/shared/Database/DBCStructure.h | 2 +- src/shared/revision_nr.h | 2 +- 23 files changed, 54 insertions(+), 54 deletions(-) diff --git a/sql/updates/6958_01_mangos_spell_proc_event.sql b/sql/updates/6958_01_mangos_spell_proc_event.sql index 06304a19e..7deab1f42 100644 --- a/sql/updates/6958_01_mangos_spell_proc_event.sql +++ b/sql/updates/6958_01_mangos_spell_proc_event.sql @@ -20,7 +20,7 @@ CREATE TABLE `spell_proc_event` ( ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- ---------------------------- --- Records +-- Records -- ---------------------------- INSERT INTO `spell_proc_event` VALUES (324, 0x00000000, 0, 0x0000000000000000, 0x00000000, 0x00000000, 0, 0, 3), @@ -703,4 +703,4 @@ INSERT INTO `spell_proc_event` VALUES (60572, 0x00000000, 11, 0x0000000090100000, 0x00000000, 0x00000000, 0, 0, 0), (60617, 0x00000000, 0, 0x0000000000000000, 0x00000000, 0x00000020, 0, 0, 0), (60826, 0x00000000, 15, 0x0000000001400000, 0x00000000, 0x00000000, 0, 0, 0), -(61324, 0x00000000, 10, 0x0002000000000000, 0x00000000, 0x00000000, 0, 0, 0); \ No newline at end of file +(61324, 0x00000000, 10, 0x0002000000000000, 0x00000000, 0x00000000, 0, 0, 0); diff --git a/sql/updates/7044_01_mangos_spell_proc_event.sql b/sql/updates/7044_01_mangos_spell_proc_event.sql index 576d5611a..8dc295b73 100644 --- a/sql/updates/7044_01_mangos_spell_proc_event.sql +++ b/sql/updates/7044_01_mangos_spell_proc_event.sql @@ -14,4 +14,4 @@ INSERT INTO `spell_proc_event` VALUES (48111, 0x00, 0, 0x00000000, 0x00000000, 0 -- (48113) Prayer of Mending (Rank 3) DELETE FROM `spell_proc_event` WHERE `entry` IN (48113); -INSERT INTO `spell_proc_event` VALUES (48113, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x000A02A8, 0x00000000, 0.000000, 0.000000, 0); \ No newline at end of file +INSERT INTO `spell_proc_event` VALUES (48113, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x000A02A8, 0x00000000, 0.000000, 0.000000, 0); diff --git a/sql/updates/7075_01_characters_character_spell.sql b/sql/updates/7075_01_characters_character_spell.sql index 4e6ef7ea9..0ec8e2f25 100644 --- a/sql/updates/7075_01_characters_character_spell.sql +++ b/sql/updates/7075_01_characters_character_spell.sql @@ -10,4 +10,4 @@ DELETE FROM character_spell WHERE `spell` IN ( /*old Shadow Resistance, leaned as racial passive of race 5 */ DELETE FROM character_spell USING character_spell INNER JOIN characters ON character_spell.guid = characters.guid -WHERE character_spell.spell = 20579 AND characters.race <> 5; +WHERE character_spell.spell = 20579 AND characters.race <> 5; diff --git a/sql/updates/7078_01_mangos_spell_proc_event.sql b/sql/updates/7078_01_mangos_spell_proc_event.sql index b5df2f7fa..ba5369582 100644 --- a/sql/updates/7078_01_mangos_spell_proc_event.sql +++ b/sql/updates/7078_01_mangos_spell_proc_event.sql @@ -20,4 +20,4 @@ INSERT INTO `spell_proc_event` VALUES (44395, 0x00, 0, 0x00000000, 0x00000000, 0 DELETE FROM `spell_proc_event` WHERE `entry` IN (44396); INSERT INTO `spell_proc_event` VALUES (44396, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000400, 0.000000, 0.000000, 0); - \ No newline at end of file + diff --git a/sql/updates/README b/sql/updates/README index 6f14366c6..61b8af96a 100644 --- a/sql/updates/README +++ b/sql/updates/README @@ -30,10 +30,10 @@ See an example below: | Counter show number of sql update in updates list for provided revision | and set proper order for sql updates for same revision | - MaNGOS commit revison related to sql update. + MaNGOS commit revison related to sql update. It included in commit description in form [6936] as you can see at http://github.com/mangos/mangos/commits/master After appling this update DB compatiable with database that include this sql update. SQL update include special protection against multiply and wrong order SQL updates apply. -So attempt apply sql update to more old DB without previous SQL update in list for targeted database +So attempt apply sql update to more old DB without previous SQL update in list for targeted database or to DB with already applied this or later SQL update will generate error and not applied. diff --git a/src/game/CalendarHandler.cpp b/src/game/CalendarHandler.cpp index 103da3eb9..fd2858646 100644 --- a/src/game/CalendarHandler.cpp +++ b/src/game/CalendarHandler.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/game/CharacterHandler.cpp b/src/game/CharacterHandler.cpp index 3d04c8a26..3ccc8e1bc 100644 --- a/src/game/CharacterHandler.cpp +++ b/src/game/CharacterHandler.cpp @@ -80,7 +80,7 @@ bool LoginQueryHolder::Initialize() res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADDECLINEDNAMES, "SELECT genitive, dative, accusative, instrumental, prepositional FROM character_declinedname WHERE guid = '%u'",GUID_LOPART(m_guid)); // in other case still be dummy query res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADGUILD, "SELECT guildid,rank FROM guild_member WHERE guid = '%u'", GUID_LOPART(m_guid)); - res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADARENAINFO, "SELECT arenateamid, played_week, played_season, personal_rating FROM arena_team_member WHERE guid='%u'", GUID_LOPART(m_guid)); + res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADARENAINFO, "SELECT arenateamid, played_week, played_season, personal_rating FROM arena_team_member WHERE guid='%u'", GUID_LOPART(m_guid)); res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADACHIEVEMENTS, "SELECT achievement, date FROM character_achievement WHERE guid = '%u'", GUID_LOPART(m_guid)); res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADCRITERIAPROGRESS,"SELECT criteria, counter, date FROM character_achievement_progress WHERE guid = '%u'", GUID_LOPART(m_guid)); diff --git a/src/game/GameObject.h b/src/game/GameObject.h index fdae7a18f..898fde2a8 100644 --- a/src/game/GameObject.h +++ b/src/game/GameObject.h @@ -349,7 +349,7 @@ struct GameObjectInfo uint32 state2Name; //3 } destructibleBuilding; //34 GAMEOBJECT_TYPE_TRAPDOOR - struct + struct { uint32 whenToPause; // 0 uint32 startOpen; // 1 diff --git a/src/game/Guild.cpp b/src/game/Guild.cpp index 4ffdf958d..4864b7204 100644 --- a/src/game/Guild.cpp +++ b/src/game/Guild.cpp @@ -1586,7 +1586,7 @@ void Guild::DisplayGuildBankLogs(WorldSession *session, uint8 TabId) { data << uint8((*itr)->LogEntry); data << uint64(MAKE_NEW_GUID((*itr)->PlayerGuid,0,HIGHGUID_PLAYER)); - if ((*itr)->LogEntry == GUILD_BANK_LOG_DEPOSIT_MONEY || + if ((*itr)->LogEntry == GUILD_BANK_LOG_DEPOSIT_MONEY || (*itr)->LogEntry == GUILD_BANK_LOG_WITHDRAW_MONEY || (*itr)->LogEntry == GUILD_BANK_LOG_REPAIR_MONEY || (*itr)->LogEntry == GUILD_BANK_LOG_UNK1 || @@ -1616,7 +1616,7 @@ void Guild::DisplayGuildBankLogs(WorldSession *session, uint8 TabId) { data << uint8((*itr)->LogEntry); data << uint64(MAKE_NEW_GUID((*itr)->PlayerGuid,0,HIGHGUID_PLAYER)); - if ((*itr)->LogEntry == GUILD_BANK_LOG_DEPOSIT_MONEY || + if ((*itr)->LogEntry == GUILD_BANK_LOG_DEPOSIT_MONEY || (*itr)->LogEntry == GUILD_BANK_LOG_WITHDRAW_MONEY || (*itr)->LogEntry == GUILD_BANK_LOG_REPAIR_MONEY || (*itr)->LogEntry == GUILD_BANK_LOG_UNK1 || diff --git a/src/game/Object.cpp b/src/game/Object.cpp index d44f73145..596c121d1 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -258,7 +258,7 @@ void Object::DestroyForPlayer(Player *target) const void Object::_BuildMovementUpdate(ByteBuffer * data, uint8 flags, uint32 flags2) const { uint16 unk_flags = ((GetTypeId() == TYPEID_PLAYER) ? ((Player*)this)->m_movementInfo.unk1 : 0); - + if(GetTypeId() == TYPEID_UNIT) if(((Creature*)this)->isVehicle()) unk_flags |= 0x20; // always allow pitch diff --git a/src/game/Player.cpp b/src/game/Player.cpp index b45691dd6..5bf05d8a8 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -427,7 +427,7 @@ Player::Player (WorldSession *session): Unit(), m_achievementMgr(this) for (int i = 0; i < MAX_COMBAT_RATING; i++) m_baseRatingValue[i] = 0; - + m_baseSpellDamage = 0; m_baseSpellHealing = 0; m_baseFeralAP = 0; @@ -4535,7 +4535,7 @@ float Player::OCTRegenMPPerSpirit() void Player::ApplyRatingMod(CombatRating cr, int32 value, bool apply) { m_baseRatingValue[cr]+=(apply ? value : -value); - + int32 amount = uint32(m_baseRatingValue[cr]); // Apply bonus from SPELL_AURA_MOD_RATING_FROM_STAT // stat used stored in miscValueB for this aura @@ -9936,7 +9936,7 @@ uint8 Player::CanEquipItem( uint8 slot, uint16 &dest, Item *pItem, bool swap, bo if(!CanDualWield()) return EQUIP_ERR_CANT_DUAL_WIELD; } - else if (type == INVTYPE_2HWEAPON) + else if (type == INVTYPE_2HWEAPON) { if(!CanDualWield() || !CanTitanGrip()) return EQUIP_ERR_CANT_DUAL_WIELD; @@ -18705,7 +18705,7 @@ bool Player::isHonorOrXPTarget(Unit* pVictim) if(pVictim->GetTypeId() == TYPEID_UNIT) { - if (((Creature*)pVictim)->isTotem() || + if (((Creature*)pVictim)->isTotem() || ((Creature*)pVictim)->isPet() || ((Creature*)pVictim)->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_XP_AT_KILL) return false; @@ -19281,7 +19281,7 @@ void Player::SetTitle(CharTitlesEntry const* title) void Player::ConvertRune(uint8 index, uint8 newType) { SetCurrentRune(index, newType); - + WorldPacket data(SMSG_CONVERT_RUNE, 2); data << uint8(index); data << uint8(newType); @@ -19362,4 +19362,4 @@ uint32 Player::CalculateTalentsPoints() const talentPointsForLevel = base_talent; return talentPointsForLevel; -} \ No newline at end of file +} diff --git a/src/game/Player.h b/src/game/Player.h index a207d4046..cd9141502 100644 --- a/src/game/Player.h +++ b/src/game/Player.h @@ -440,7 +440,7 @@ enum PlayerFlags PLAYER_FLAGS_UNK18 = 0x00020000, // taxi benchmark mode (on/off) (2.0.1) PLAYER_FLAGS_PVP_TIMER = 0x00040000, // 3.0.2, pvp timer active (after you disable pvp manually) PLAYER_FLAGS_UNK20 = 0x00080000, - PLAYER_FLAGS_UNK21 = 0x00100000, + PLAYER_FLAGS_UNK21 = 0x00100000, PLAYER_FLAGS_UNK22 = 0x00200000, PLAYER_FLAGS_UNK23 = 0x00400000, PLAYER_FLAGS_UNK24 = 0x00800000, // disabled all abilitys on tab except autoattack diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 6cc1620f0..6076308b0 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -4243,7 +4243,7 @@ uint8 Spell::CanCast(bool strict) break; } - // This is generic summon effect + // This is generic summon effect case SPELL_EFFECT_SUMMON: { switch(m_spellInfo->EffectMiscValueB[i]) diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index efc1ff2eb..5ae889278 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -340,7 +340,7 @@ Aura::Aura(SpellEntry const* spellproto, uint32 eff, int32 *currentBasePoints, U m_spellmod(NULL), m_caster_guid(0), m_castItemGuid(castItem?castItem->GetGUID():0), m_target(target), m_timeCla(1000), m_periodicTimer(0), m_removeMode(AURA_REMOVE_BY_DEFAULT), m_AuraDRGroup(DIMINISHING_NONE), m_effIndex(eff), m_auraSlot(MAX_AURAS), m_auraFlags(AFLAG_NONE), m_auraLevel(1), m_procCharges(0), m_stackAmount(1), -m_positive(false), m_permanent(false), m_isPeriodic(false), m_isAreaAura(false), m_isPersistent(false), +m_positive(false), m_permanent(false), m_isPeriodic(false), m_isAreaAura(false), m_isPersistent(false), m_updated(false), m_isRemovedOnShapeLost(true), m_in_use(false) { assert(target); @@ -970,7 +970,7 @@ void Aura::_AddAura() // Conflagrate aura state on Immolate if (m_spellProto->SpellFamilyName == SPELLFAMILY_WARLOCK && m_spellProto->SpellFamilyFlags & 4) m_target->ModifyAuraState(AURA_STATE_IMMOLATE, true); - + // Faerie Fire (druid versions) if (m_spellProto->SpellFamilyName == SPELLFAMILY_DRUID && m_spellProto->SpellFamilyFlags & 0x0000000000000400LL) m_target->ModifyAuraState(AURA_STATE_FAERIE_FIRE, true); @@ -1093,7 +1093,7 @@ void Aura::_RemoveAura() for(Unit::AuraMap::iterator i = Auras.begin(); i != Auras.end(); ++i) { SpellEntry const *auraSpellInfo = (*i).second->GetSpellProto(); - if(auraSpellInfo->SpellFamilyName == m_spellProto->SpellFamilyName && + if(auraSpellInfo->SpellFamilyName == m_spellProto->SpellFamilyName && auraSpellInfo->SpellFamilyFlags == m_spellProto->SpellFamilyFlags ) { found = true; @@ -2146,14 +2146,14 @@ void Aura::HandleAuraDummy(bool apply, bool Real) if (caster && m_removeMode == AURA_REMOVE_BY_DEATH) { // Stop caster Arcane Missle chanelling on death - if (m_spellProto->SpellFamilyName == SPELLFAMILY_MAGE && + if (m_spellProto->SpellFamilyName == SPELLFAMILY_MAGE && m_spellProto->SpellFamilyFlags&0x0000000000000800LL) { caster->InterruptSpell(CURRENT_CHANNELED_SPELL); return; } // Stop caster Penance chanelling on death - if (m_spellProto->SpellFamilyName == SPELLFAMILY_PRIEST && + if (m_spellProto->SpellFamilyName == SPELLFAMILY_PRIEST && m_spellProto->SpellFamilyFlags2 & 0x00000080) { caster->InterruptSpell(CURRENT_CHANNELED_SPELL); @@ -6321,7 +6321,7 @@ void Aura::PeriodicDummyTick() // case 33208: break; // // Gossip NPC Periodic - Despawn // case 33209: break; - + // TODO: now its not periodic dummy - need move out from here // Aspect of the Viper case 34074: diff --git a/src/game/SpellAuras.h b/src/game/SpellAuras.h index 2f0de60cf..31a49ab4c 100644 --- a/src/game/SpellAuras.h +++ b/src/game/SpellAuras.h @@ -258,7 +258,7 @@ class MANGOS_DLL_SPEC Aura uint8 GetAuraLevel() const { return m_auraLevel; } void SetAuraLevel(uint8 level) { m_auraLevel = level; } uint8 GetAuraCharges() const { return m_procCharges; } - void SetAuraCharges(uint8 charges) + void SetAuraCharges(uint8 charges) { if (m_procCharges == charges) return; @@ -266,7 +266,7 @@ class MANGOS_DLL_SPEC Aura SendAuraUpdate(false); } bool DropAuraCharge() // return true if last charge dropped - { + { if (m_procCharges == 0) return false; m_procCharges--; diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index bcd313fc6..6ee0f7d42 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -146,7 +146,7 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]= &Spell::EffectSummonPlayer, // 85 SPELL_EFFECT_SUMMON_PLAYER &Spell::EffectActivateObject, // 86 SPELL_EFFECT_ACTIVATE_OBJECT &Spell::EffectUnused, // 87 SPELL_EFFECT_WMO_DAMAGE - &Spell::EffectUnused, // 88 SPELL_EFFECT_WMO_REPAIR + &Spell::EffectUnused, // 88 SPELL_EFFECT_WMO_REPAIR &Spell::EffectUnused, // 89 SPELL_EFFECT_WMO_CHANGE &Spell::EffectUnused, // 90 SPELL_EFFECT_KILL_CREDIT &Spell::EffectUnused, // 91 SPELL_EFFECT_THREAT_ALL one spell: zzOLDBrainwash @@ -493,7 +493,7 @@ void Spell::EffectSchoolDMG(uint32 effect_idx) // Lookup for Deadly poison (only attacker applied) Unit::AuraList const& auras = unitTarget->GetAurasByType(SPELL_AURA_PERIODIC_DAMAGE); for(Unit::AuraList::const_iterator itr = auras.begin(); itr!=auras.end(); ++itr) - if( (*itr)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_ROGUE && + if( (*itr)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_ROGUE && (*itr)->GetSpellProto()->SpellFamilyFlags & 0x10000 && (*itr)->GetCasterGUID()==m_caster->GetGUID() ) { @@ -928,7 +928,7 @@ void Spell::EffectDummy(uint32 i) { Aura * dummy = m_caster->GetDummyAura(28734); if (dummy) - { + { int32 bp = damage * dummy->GetStackAmount(); m_caster->CastCustomSpell(m_caster, 28733, &bp, NULL, NULL, true); m_caster->RemoveAurasDueToSpell(28734); @@ -1265,7 +1265,7 @@ void Spell::EffectDummy(uint32 i) if (Aura *aura = m_caster->GetDummyAura(58367)) rage+=aura->GetModifier()->m_amount; - int32 basePoints0 = damage+int32(rage * m_spellInfo->DmgMultiplier[i] + + int32 basePoints0 = damage+int32(rage * m_spellInfo->DmgMultiplier[i] + m_caster->GetTotalAttackPowerValue(BASE_ATTACK)*0.2f); m_caster->CastCustomSpell(unitTarget, 20647, &basePoints0, NULL, NULL, true, 0); m_caster->SetPower(POWER_RAGE,0); @@ -1754,7 +1754,7 @@ void Spell::EffectDummy(uint32 i) Unit::AuraList const& auraDummy = m_caster->GetAurasByType(SPELL_AURA_DUMMY); for(Unit::AuraList::const_iterator itr = auraDummy.begin(); itr != auraDummy.end(); ++itr) { - if( (*itr)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_SHAMAN && + if( (*itr)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_SHAMAN && (*itr)->GetSpellProto()->SpellFamilyFlags & 0x0000000000200000LL && (*itr)->GetCastItemGUID() == item->GetGUID()) { @@ -4285,8 +4285,8 @@ void Spell::EffectWeaponDmg(uint32 i) for(Unit::AuraMap::iterator itr = suAuras.begin(); itr != suAuras.end(); ++itr) { SpellEntry const *spellInfo = (*itr).second->GetSpellProto(); - if( spellInfo->SpellFamilyName == SPELLFAMILY_WARRIOR && - spellInfo->SpellFamilyFlags & 0x0000000000004000LL && + if( spellInfo->SpellFamilyName == SPELLFAMILY_WARRIOR && + spellInfo->SpellFamilyFlags & 0x0000000000004000LL && (*itr).second->GetCasterGUID() == m_caster->GetGUID()) { (*itr).second->RefreshAura(); @@ -4839,7 +4839,7 @@ void Spell::EffectScriptEffect(uint32 effIndex) case 60893: // Northrend Alchemy Research case 61177: // Northrend Inscription Research case 61288: // Minor Inscription Research - case 61756: // Northrend Inscription Research (FAST QA VERSION) + case 61756: // Northrend Inscription Research (FAST QA VERSION) { if(!IsExplicitDiscoverySpell(m_spellInfo)) { diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 47b96539e..56a59d79e 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -172,7 +172,7 @@ SpellSpecific GetSpellSpecific(uint32 spellId) // only hunter aspects have this (but not all aspects in hunter family) if( spellInfo->SpellFamilyFlags & 0x0044000000380000LL || spellInfo->SpellFamilyFlags2 & 0x00003010) return SPELL_ASPECT; - + if( spellInfo->SpellFamilyFlags2 & 0x00000002 ) return SPELL_TRACKER; @@ -736,7 +736,7 @@ void SpellMgr::LoadSpellAffects() case 0: ptr = &spellInfo->EffectSpellClassMaskA[0]; break; case 1: ptr = &spellInfo->EffectSpellClassMaskB[0]; break; case 2: ptr = &spellInfo->EffectSpellClassMaskC[0]; break; - default: + default: continue; } if(ptr[0] == affect.SpellClassMask[0] || ptr[1] == affect.SpellClassMask[1] || ptr[2] == affect.SpellClassMask[2]) @@ -776,7 +776,7 @@ void SpellMgr::LoadSpellAffects() case 0: ptr = &spellInfo->EffectSpellClassMaskA[0]; break; case 1: ptr = &spellInfo->EffectSpellClassMaskB[0]; break; case 2: ptr = &spellInfo->EffectSpellClassMaskC[0]; break; - default: + default: continue; } if(ptr[0] || ptr[1] || ptr[2]) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index dd3fa9d40..25a990d1b 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -1099,7 +1099,7 @@ void Unit::CalculateSpellDamage(SpellNonMeleeDamage *damageInfo, int32 damage, S ignore = true; break; } - + if (!ignore) { CalcAbsorbResist(pVictim, damageSchoolMask, SPELL_DIRECT_DAMAGE, damage, &damageInfo->absorb, &damageInfo->resist); @@ -2399,7 +2399,7 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell) // Can`t dodge from behind in PvP (but its possible in PvE) if (GetTypeId() == TYPEID_PLAYER && pVictim->GetTypeId() == TYPEID_PLAYER) canDodge = false; - // Can`t parry + // Can`t parry canParry = false; } // Check creatures flags_extra for disable parry @@ -4744,7 +4744,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu for(AuraMap::iterator iter = Auras.begin(); iter != Auras.end();) { SpellEntry const *spell = iter->second->GetSpellProto(); - if( spell->Mechanic == MECHANIC_STUN || + if( spell->Mechanic == MECHANIC_STUN || spell->EffectMechanic[iter->second->GetEffIndex()] == MECHANIC_STUN) { pVictim->RemoveAurasDueToSpell(spell->Id); @@ -5837,7 +5837,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu // Mark of Blood if (dummySpell->Id == 49005) { - // TODO: need more info (cooldowns/PPM) + // TODO: need more info (cooldowns/PPM) triggered_spell_id = 50424; break; } @@ -7842,7 +7842,7 @@ bool Unit::isSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolM } // Glyph of Shadowburn if (spellProto->SpellFamilyName == SPELLFAMILY_WARLOCK && - spellProto->SpellFamilyFlags & 0x0000000000000080LL && + spellProto->SpellFamilyFlags & 0x0000000000000080LL && pVictim->HasAuraState(AURA_STATE_HEALTHLESS_35_PERCENT)) { AuraList const& mOverrideClassScript = GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS); diff --git a/src/game/Unit.h b/src/game/Unit.h index a779ba874..cee454f89 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -650,7 +650,7 @@ struct UnitActionBarEntry union { - struct + struct { uint16 SpellOrAction; uint16 Type; diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp index bcebb7ff7..9671041f9 100644 --- a/src/game/WorldSession.cpp +++ b/src/game/WorldSession.cpp @@ -531,7 +531,7 @@ void WorldSession::LoadAccountData() if(!result) return; - do + do { Field *fields = result->Fetch(); diff --git a/src/shared/Database/DBCStores.cpp b/src/shared/Database/DBCStores.cpp index a486d2896..02db49af9 100644 --- a/src/shared/Database/DBCStores.cpp +++ b/src/shared/Database/DBCStores.cpp @@ -221,7 +221,7 @@ void LoadDBCStores(const std::string& dataPath) LoadDBC(availableDbcLocales,bar,bad_dbc_files,sBattlemasterListStore, dbcPath,"BattlemasterList.dbc"); LoadDBC(availableDbcLocales,bar,bad_dbc_files,sBarberShopStyleStore, dbcPath,"BarberShopStyle.dbc"); LoadDBC(availableDbcLocales,bar,bad_dbc_files,sCharStartOutfitStore, dbcPath,"CharStartOutfit.dbc"); - + LoadDBC(availableDbcLocales,bar,bad_dbc_files,sCharTitlesStore, dbcPath,"CharTitles.dbc"); LoadDBC(availableDbcLocales,bar,bad_dbc_files,sChatChannelsStore, dbcPath,"ChatChannels.dbc"); LoadDBC(availableDbcLocales,bar,bad_dbc_files,sChrClassesStore, dbcPath,"ChrClasses.dbc"); @@ -503,11 +503,11 @@ void LoadDBCStores(const std::string& dataPath) // check at up-to-date DBC files (2425 is last item extended cost added in 3.0.1) // check at up-to-date DBC files (76 is last char title added in 3.0.1) // check at up-to-date DBC files (2311 is last area added in 3.0.1) - if( !sSpellStore.LookupEntry(54909) || - !sSkillLineAbilityStore.LookupEntry(19162) || + if( !sSpellStore.LookupEntry(54909) || + !sSkillLineAbilityStore.LookupEntry(19162) || !sMapStore.LookupEntry(619) || - !sGemPropertiesStore.LookupEntry(1361) || - !sItemExtendedCostStore.LookupEntry(2425) || + !sGemPropertiesStore.LookupEntry(1361) || + !sItemExtendedCostStore.LookupEntry(2425) || !sCharTitlesStore.LookupEntry(76) || !sAreaStore.LookupEntry(2311) ) { diff --git a/src/shared/Database/DBCStructure.h b/src/shared/Database/DBCStructure.h index da2f5315e..b8a9fbb4b 100644 --- a/src/shared/Database/DBCStructure.h +++ b/src/shared/Database/DBCStructure.h @@ -1410,7 +1410,7 @@ struct VehicleEntry uint32 m_uiSeatIndicatorType; // 42 }; -struct VehicleSeatEntry +struct VehicleSeatEntry { uint32 m_ID; // 0 uint32 m_flags; // 1 diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 933fa94ab..ca2f93eef 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 "7145" + #define REVISION_NR "7146" #endif // __REVISION_NR_H__ -- 2.11.4.GIT