From 91affef0c681e2ca650c264235b56996cac633a7 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Sat, 25 Nov 2017 01:36:21 +0100 Subject: [PATCH] Misc: Kill trailing white spaces --- src/common/Collision/Management/IVMapManager.h | 2 +- src/common/Collision/Management/VMapManager2.cpp | 2 +- src/common/Debugging/WheatyExceptionReport.cpp | 2 +- src/server/bnetserver/Packets/PacketManager.h | 2 +- src/server/game/AI/SmartScripts/SmartAI.cpp | 2 +- src/server/game/AI/SmartScripts/SmartScript.cpp | 2 +- src/server/game/AI/SmartScripts/SmartScriptMgr.h | 4 ++-- .../game/Battlefield/Zones/BattlefieldTB.cpp | 4 ++-- src/server/game/Battlefield/Zones/BattlefieldTB.h | 14 +++++++------- src/server/game/Entities/Object/Object.cpp | 2 +- src/server/game/Entities/Player/Player.cpp | 6 +++--- src/server/game/Entities/Player/SocialMgr.h | 2 +- src/server/game/Entities/Unit/StatSystem.cpp | 2 +- src/server/game/Entities/Unit/Unit.cpp | 4 ++-- src/server/game/Globals/ObjectMgr.cpp | 6 +++--- src/server/game/Globals/ObjectMgr.h | 2 +- src/server/game/Guilds/GuildFinderMgr.cpp | 2 +- src/server/game/Miscellaneous/SharedDefines.h | 2 +- src/server/game/Movement/MotionMaster.cpp | 4 ++-- src/server/game/Scripting/ScriptMgr.h | 2 +- src/server/game/Scripting/ScriptSystem.cpp | 2 +- src/server/game/Server/Protocol/Opcodes.cpp | 6 +++--- src/server/game/Spells/Auras/SpellAuraEffects.cpp | 4 ++-- src/server/game/Spells/SpellEffects.cpp | 6 +++--- src/server/game/Spells/SpellInfo.cpp | 2 +- src/server/game/Storages/WhoListStorage.cpp | 4 ++-- src/server/ipc/ZmqListener.h | 4 ++-- src/server/ipc/ZmqMux.h | 2 +- src/server/scripts/CMakeLists.txt | 2 +- src/server/scripts/Commands/cs_gobject.cpp | 2 +- src/server/scripts/Commands/cs_misc.cpp | 2 +- src/server/scripts/Commands/cs_npc.cpp | 4 ++-- .../EasternKingdoms/ScarletEnclave/chapter2.cpp | 2 +- .../RazorfenKraul/instance_razorfen_kraul.cpp | 2 +- .../scripts/Maelstrom/Stonecore/boss_corborus.cpp | 6 +++--- .../Stonecore/boss_high_priestess_azil.cpp | 4 ++-- .../scripts/Maelstrom/Stonecore/boss_ozruk.cpp | 2 +- .../scripts/Maelstrom/Stonecore/boss_slabhide.cpp | 8 ++++---- .../Maelstrom/Stonecore/instance_stonecore.cpp | 2 +- .../scripts/Maelstrom/Stonecore/stonecore.cpp | 2 +- .../AzjolNerub/AzjolNerub/boss_anubarak.cpp | 4 ++-- .../AzjolNerub/AzjolNerub/boss_hadronox.cpp | 4 ++-- .../AzjolNerub/boss_krikthir_the_gatewatcher.cpp | 2 +- .../AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp | 2 +- .../scripts/Northrend/Naxxramas/boss_thaddius.cpp | 2 +- src/server/scripts/Northrend/zone_dragonblight.cpp | 2 +- .../scripts/Northrend/zone_howling_fjord.cpp | 2 +- .../Outland/BlackTemple/boss_gurtogg_bloodboil.cpp | 2 +- .../Outland/TempestKeep/Eye/boss_kaelthas.cpp | 2 +- src/server/scripts/Spells/spell_item.cpp | 6 +++--- src/server/scripts/Spells/spell_mage.cpp | 6 +++--- src/server/scripts/Spells/spell_quest.cpp | 2 +- src/server/scripts/World/go_scripts.cpp | 4 ++-- src/server/scripts/World/npc_professions.cpp | 2 +- 54 files changed, 89 insertions(+), 89 deletions(-) diff --git a/src/common/Collision/Management/IVMapManager.h b/src/common/Collision/Management/IVMapManager.h index 61d96aec2c7..a89fefa9d63 100644 --- a/src/common/Collision/Management/IVMapManager.h +++ b/src/common/Collision/Management/IVMapManager.h @@ -66,7 +66,7 @@ namespace VMAP uint32 const type; float const level; }; - + float floorZ = VMAP_INVALID_HEIGHT; Optional areaInfo; Optional liquidInfo; diff --git a/src/common/Collision/Management/VMapManager2.cpp b/src/common/Collision/Management/VMapManager2.cpp index caa19d6b8d4..f74fe2b8951 100644 --- a/src/common/Collision/Management/VMapManager2.cpp +++ b/src/common/Collision/Management/VMapManager2.cpp @@ -303,7 +303,7 @@ namespace VMAP if (!reqLiquidType || (GetLiquidFlagsPtr(liquidType) & reqLiquidType)) if (info.hitInstance->GetLiquidLevel(pos, info, liquidLevel)) data.liquidInfo = boost::in_place(liquidType, liquidLevel); - + if (!IsVMAPDisabledForPtr(mapId, VMAP_DISABLE_AREAFLAG)) data.areaInfo = boost::in_place(info.hitInstance->adtId, info.rootId, info.hitModel->GetWmoID(), info.hitModel->GetMogpFlags()); } diff --git a/src/common/Debugging/WheatyExceptionReport.cpp b/src/common/Debugging/WheatyExceptionReport.cpp index 54199824ac2..be011f005ad 100644 --- a/src/common/Debugging/WheatyExceptionReport.cpp +++ b/src/common/Debugging/WheatyExceptionReport.cpp @@ -824,7 +824,7 @@ PVOID UserContext) { ClearSymbols(); FormatSymbolValue(pSymInfo, (STACKFRAME64*)UserContext); - + } __except (EXCEPTION_EXECUTE_HANDLER) { diff --git a/src/server/bnetserver/Packets/PacketManager.h b/src/server/bnetserver/Packets/PacketManager.h index 16399d50a16..c7e92137fcd 100644 --- a/src/server/bnetserver/Packets/PacketManager.h +++ b/src/server/bnetserver/Packets/PacketManager.h @@ -37,7 +37,7 @@ namespace Battlenet { typedef ClientPacket*(*PacketCreateFn)(PacketHeader const& header, BitStream& stream); - struct PacketInfo + struct PacketInfo { PacketCreateFn Constructor; char const* Name; diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index c8ff2d1a7d4..ada61de1168 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -296,7 +296,7 @@ void SmartAI::UpdatePath(const uint32 diff) { if (mEscortInvokerCheckTimer < diff) { - // Escort failed, no players in range + // Escort failed, no players in range if (!IsEscortInvokerInRange()) { StopPath(0, mEscortQuestID, true); diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index acac491a010..77eaa865e72 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -3718,7 +3718,7 @@ void SmartScript::ProcessEvent(SmartScriptHolder& e, Unit* unit, uint32 var0, ui if (gameobject) ProcessTimedAction(e, e.event.distance.repeat, e.event.distance.repeat, nullptr, 0, 0, false, nullptr, gameobject); - + break; } case SMART_EVENT_COUNTER_SET: diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h index 590133fcc45..161258f1112 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h @@ -89,8 +89,8 @@ enum SMART_EVENT_PHASE_BITS SMART_EVENT_PHASE_10_BIT = 512, SMART_EVENT_PHASE_11_BIT = 1024, SMART_EVENT_PHASE_12_BIT = 2048, - SMART_EVENT_PHASE_ALL = SMART_EVENT_PHASE_1_BIT + SMART_EVENT_PHASE_2_BIT + SMART_EVENT_PHASE_3_BIT + SMART_EVENT_PHASE_4_BIT + SMART_EVENT_PHASE_5_BIT + - SMART_EVENT_PHASE_6_BIT + SMART_EVENT_PHASE_7_BIT + SMART_EVENT_PHASE_8_BIT + SMART_EVENT_PHASE_9_BIT + SMART_EVENT_PHASE_10_BIT + + SMART_EVENT_PHASE_ALL = SMART_EVENT_PHASE_1_BIT + SMART_EVENT_PHASE_2_BIT + SMART_EVENT_PHASE_3_BIT + SMART_EVENT_PHASE_4_BIT + SMART_EVENT_PHASE_5_BIT + + SMART_EVENT_PHASE_6_BIT + SMART_EVENT_PHASE_7_BIT + SMART_EVENT_PHASE_8_BIT + SMART_EVENT_PHASE_9_BIT + SMART_EVENT_PHASE_10_BIT + SMART_EVENT_PHASE_11_BIT + SMART_EVENT_PHASE_12_BIT }; diff --git a/src/server/game/Battlefield/Zones/BattlefieldTB.cpp b/src/server/game/Battlefield/Zones/BattlefieldTB.cpp index 72fc3b11d79..0bd2cf4d2e4 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldTB.cpp +++ b/src/server/game/Battlefield/Zones/BattlefieldTB.cpp @@ -40,7 +40,7 @@ const uint32 TBFactions[BG_TEAMS_COUNT] = { 1610, 1732 }; // Stalker Position const TolBaradDebugAnnouncerPos = { -1234.25f, 961.903f, 159.4913f, 0.0f }; -uint32 const TB_QUEST_INFANTRY[BG_TEAMS_COUNT][4] = +uint32 const TB_QUEST_INFANTRY[BG_TEAMS_COUNT][4] = { { NPC_HORDE_DRUID_INFANTRY, NPC_HORDE_MAGE_INFANTRY, NPC_HORDE_ROGUE_INFANTRY, NPC_HORDE_SHAMAN_INFANTRY }, { NPC_ALLIANCE_WARRIOR_INFANTRY, NPC_ALLIANCE_PALADIN_INFANTRY, NPC_ALLIANCE_HUNTER_INFANTRY, NPC_ALLIANCE_MAGE_INFANTRY }, @@ -153,7 +153,7 @@ struct TBCapturePointSpawnData uint32 textGained[2]; uint32 textLost[2]; }; - + TBCapturePointSpawnData const TBCapturePoints[TB_BASE_COUNT] = { { { -896.96f, 979.497f, 121.441f, 3.124123f }, { 0.f, 0.f, 0.99996185f, 0.00873472f }, TB_BASE_IRONCLAD_GARRISON, { GO_CAPTURE_POINT_NORTH_A_DEFENDING, GO_CAPTURE_POINT_NORTH_H_DEFENDING }, { TB_WS_GARRISON_ALLIANCE_CONTROLLED, TB_WS_GARRISON_HORDE_CONTROLLED }, { TB_WS_GARRISON_ALLIANCE_CAPTURING, TB_WS_GARRISON_HORDE_CAPTURING }, TB_WS_GARRISON_NEUTRAL, { TB_TEXT_GARRISON_ALLIANCE_GAINED, TB_TEXT_GARRISON_HORDE_GAINED }, { TB_TEXT_GARRISON_ALLIANCE_LOST, TB_TEXT_GARRISON_HORDE_LOST } }, diff --git a/src/server/game/Battlefield/Zones/BattlefieldTB.h b/src/server/game/Battlefield/Zones/BattlefieldTB.h index 2d38395bc35..dbdacf64487 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldTB.h +++ b/src/server/game/Battlefield/Zones/BattlefieldTB.h @@ -51,7 +51,7 @@ enum TolBaradSpells SPELL_REWARD_TOWER_INTACT = 89794, SPELL_REWARD_TOWER_DAMAGED = 89795, SPELL_REWARD_TOWER_DESTROYED = 89796, - + // Player buffs SPELL_TB_SLOW_FALL = 88473, SPELL_TB_VETERAN = 84655, @@ -64,7 +64,7 @@ enum TolBaradSpells SPELL_RIDE_TOL_BARAD_VEHICLE = 84754, SPELL_DEPLOY_SIEGE_MODE = 84974, SPELL_SIEGE_CANNON_AURA = 85167, // aura, periodically triggers spell 85122 -// SPELL_SIEGE_CANNON_EFFECT = 85122, // targets random +// SPELL_SIEGE_CANNON_EFFECT = 85122, // targets random // SPELL_SIEGE_CANNON_DAMAGE = 85125, SPELL_LEAVE_SIEGE_MODE = 85078, @@ -109,7 +109,7 @@ enum TolBaradNpcs NPC_TB_GY_SPIRIT_WARDENS_VIGIL_A = 45069, NPC_TB_GY_SPIRIT_EAST_SPIRE_A = 45070, NPC_TB_GY_SPIRIT_SOUTH_SPIRE_A = 45071, - NPC_TB_GY_SPIRIT_WEST_SPIRE_A = 45072, + NPC_TB_GY_SPIRIT_WEST_SPIRE_A = 45072, NPC_TB_GY_SPIRIT_SLAGWORKS_A = 45073, NPC_TB_GY_SPIRIT_IRONCLAD_GARRISON_H = 45074, NPC_TB_GY_SPIRIT_WARDENS_VIGIL_H = 45075, @@ -165,7 +165,7 @@ enum TolBaradWorldStates TB_WS_HORDE_CONTROLS_SHOW = 5384, TB_WS_ALLIANCE_ATTACKING_SHOW = 5546, TB_WS_HORDE_ATTACKING_SHOW = 5547, - + TB_WS_BUILDINGS_CAPTURED = 5348, TB_WS_BUILDINGS_CAPTURED_SHOW = 5349, TB_WS_TOWERS_DESTROYED = 5347, @@ -263,7 +263,7 @@ enum TolBaradText TB_TEXT_SLAGWORKS_ALLIANCE_GAINED = 15, TB_TEXT_SLAGWORKS_ALLIANCE_LOST = 16, TB_TEXT_SLAGWORKS_HORDE_GAINED = 17, - TB_TEXT_SLAGWORKS_HORDE_LOST = 18, + TB_TEXT_SLAGWORKS_HORDE_LOST = 18, TB_TEXT_FORTRESS_DEFEND_ALLIANCE = 19, TB_TEXT_FORTRESS_DEFEND_HORDE = 20, TB_TEXT_FORTRESS_CAPTURE_ALLIANCE = 21, @@ -481,7 +481,7 @@ class TC_GAME_API BattlefieldTB : public Battlefield bool updatedNPCAndObjects; uint32 m_updateObjectsTimer; - + uint32 m_BonusTime; GuidSet BattleInactiveNPCs; @@ -490,7 +490,7 @@ class TC_GAME_API BattlefieldTB : public Battlefield GuidSet TemporaryNPCs; GuidSet TemporaryGOs; - GuidSet Towers; + GuidSet Towers; uint8 m_iCellblockRandom; diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 960f3b0bd5c..2d25082242e 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -2977,7 +2977,7 @@ void WorldObject::RebuildWorldMapAreaSwaps() // Clear all world map area swaps, will be rebuilt below _worldMapAreaSwaps.clear(); - // get ALL default terrain swaps, if we are using it (condition is true) + // get ALL default terrain swaps, if we are using it (condition is true) // send the worldmaparea for it, to see swapped worldmaparea in client from other maps too, not just from our current TerrainPhaseInfo const& defaults = sObjectMgr->GetDefaultTerrainSwapStore(); for (TerrainPhaseInfo::const_iterator itr = defaults.begin(); itr != defaults.end(); ++itr) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 6693b278259..46f69ce3cb2 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -4628,7 +4628,7 @@ void Player::DeleteOldCharacters() void Player::DeleteOldCharacters(uint32 keepDays) { TC_LOG_INFO("entities.player", "Player::DeleteOldCharacters: Deleting all characters which have been deleted %u days before...", keepDays); - + PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHAR_OLD_CHARS); stmt->setUInt32(0, uint32(time(nullptr) - time_t(keepDays * DAY))); PreparedQueryResult result = CharacterDatabase.Query(stmt); @@ -5512,7 +5512,7 @@ void Player::ApplyRatingMod(CombatRating combatRating, int32 value, bool apply) ApplyAttackTimePercentMod(OFF_ATTACK, oldVal, false); ApplyAttackTimePercentMod(BASE_ATTACK, newVal, true); ApplyAttackTimePercentMod(OFF_ATTACK, newVal, true); - if (getClass() == CLASS_DEATH_KNIGHT) + if (getClass() == CLASS_DEATH_KNIGHT) UpdateAllRunesRegen(); break; case CR_HASTE_RANGED: @@ -27776,7 +27776,7 @@ void Player::SetRestFlag(RestFlag restFlag, uint32 triggerId /*= 0*/) _restTime = time(nullptr); SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING); } - + if (triggerId) inn_triggerId = triggerId; } diff --git a/src/server/game/Entities/Player/SocialMgr.h b/src/server/game/Entities/Player/SocialMgr.h index 4b64e635dc0..b8482ecc9f0 100644 --- a/src/server/game/Entities/Player/SocialMgr.h +++ b/src/server/game/Entities/Player/SocialMgr.h @@ -150,7 +150,7 @@ class SocialMgr // Loading PlayerSocial* LoadFromDB(PreparedQueryResult result, ObjectGuid const& guid); - + private: typedef std::map SocialMap; SocialMap _socialMap; diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp index d2c16adfe15..ae07fcfb0c8 100644 --- a/src/server/game/Entities/Unit/StatSystem.cpp +++ b/src/server/game/Entities/Unit/StatSystem.cpp @@ -915,7 +915,7 @@ void Creature::UpdateAttackPowerAndDamage(bool ranged) SetInt32Value(index, uint32(baseAttackPower)); // UNIT_FIELD_(RANGED)_ATTACK_POWER SetInt32Value(indexModPos, uint32(attackPowerMod > 0.f ? attackPowerMod : 0.f)); // UNIT_FIELD_(RANGED)_ATTACK_POWER_MOD_POS - SetInt32Value(indexModNeg, uint32(attackPowerMod < 0.f ? -attackPowerMod : 0.f)); // UNIT_FIELD_(RANGED)_ATTACK_POWER_MOD_NEG + SetInt32Value(indexModNeg, uint32(attackPowerMod < 0.f ? -attackPowerMod : 0.f)); // UNIT_FIELD_(RANGED)_ATTACK_POWER_MOD_NEG SetFloatValue(indexMulti, attackPowerMultiplier); // UNIT_FIELD_(RANGED)_ATTACK_POWER_MULTIPLIER // automatically update weapon damage after attack power modification diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index fd63f7b7968..0e265cbcc4c 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -4348,7 +4348,7 @@ void Unit::GetDispellableAuraList(Unit* caster, uint32 dispelMask, DispelCharges if (aura->GetSpellInfo()->GetDispelMask() & dispelMask) { // do not remove positive auras if friendly target - // negative auras if non-friendly + // negative auras if non-friendly // unless we're reflecting (dispeller eliminates one of it's benefitial buffs) if (isReflect != (aurApp->IsPositive() == IsFriendlyTo(caster))) continue; @@ -13545,7 +13545,7 @@ bool Unit::UpdatePosition(float x, float y, float z, float orientation, bool tel bool const turn = G3D::fuzzyGt(M_PI - fabs(fabs(GetOrientation() - orientation) - M_PI), 0.0f); // G3D::fuzzyEq won't help here, in some cases magnitudes differ by a little more than G3D::eps, but should be considered equal - bool const relocated = (teleport || + bool const relocated = (teleport || std::fabs(GetPositionX() - x) > 0.001f || std::fabs(GetPositionY() - y) > 0.001f || std::fabs(GetPositionZ() - z) > 0.001f); diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 3c1dde1749a..b7582ccab8d 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -2119,7 +2119,7 @@ void ObjectMgr::LoadGameobjects() QueryResult result = WorldDatabase.Query("SELECT gameobject.guid, id, map, position_x, position_y, position_z, orientation, " // 7 8 9 10 11 12 13 14 15 16 17 "rotation0, rotation1, rotation2, rotation3, spawntimesecs, animprogress, state, spawnMask, phaseMask, eventEntry, pool_entry, " - // 18 19 + // 18 19 "phaseid, phasegroup, ScriptName " "FROM gameobject LEFT OUTER JOIN game_event_gameobject ON gameobject.guid = game_event_gameobject.guid " "LEFT OUTER JOIN pool_gameobject ON gameobject.guid = pool_gameobject.guid"); @@ -5906,7 +5906,7 @@ void ObjectMgr::LoadQuestGreetings() uint32 id = fields[0].GetUInt32(); uint8 type = fields[1].GetUInt8(); // overwrite - switch (type) + switch (type) { case 0: // Creature type = TYPEID_UNIT; @@ -9638,7 +9638,7 @@ GameObjectTemplate const* ObjectMgr::GetGameObjectTemplate(uint32 entry) const return nullptr; } - + GameObjectTemplateAddon const* ObjectMgr::GetGameObjectTemplateAddon(uint32 entry) const { auto itr = _gameObjectTemplateAddonStore.find(entry); diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 4c44c6399b3..d1c2f816f53 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -1505,7 +1505,7 @@ class TC_GAME_API ObjectMgr PetLevelInfoContainer _petInfoStore; // [creature_id][level] void BuildPlayerLevelInfo(uint8 race, uint8 class_, uint8 level, PlayerLevelInfo* plinfo) const; - + PlayerInfo* _playerInfo[MAX_RACES][MAX_CLASSES]; typedef std::vector PlayerXPperLevel; // [level] diff --git a/src/server/game/Guilds/GuildFinderMgr.cpp b/src/server/game/Guilds/GuildFinderMgr.cpp index 36d62f8c99a..8962d76651f 100644 --- a/src/server/game/Guilds/GuildFinderMgr.cpp +++ b/src/server/game/Guilds/GuildFinderMgr.cpp @@ -190,7 +190,7 @@ void GuildFinderMgr::RemoveMembershipRequest(uint32 playerId, uint32 guildId) // Notify the guild master and officers the list changed if (Guild* guild = sGuildMgr->GetGuildById(guildId)) SendApplicantListUpdate(*guild); - + _membershipRequests[guildId].erase(itr); } diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index de0c6c9c357..8b1b8630366 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -3066,7 +3066,7 @@ enum CreatureTypeFlags CREATURE_TYPE_FLAG_HIDE_NAME_PLATE = 0x00100000, CREATURE_TYPE_FLAG_DO_NOT_PLAY_MOUNTED_ANIMATIONS = 0x00200000, CREATURE_TYPE_FLAG_IS_LINK_ALL = 0x00400000, - CREATURE_TYPE_FLAG_INTERACT_ONLY_WITH_CREATOR = 0x00800000, + CREATURE_TYPE_FLAG_INTERACT_ONLY_WITH_CREATOR = 0x00800000, CREATURE_TYPE_FLAG_DO_NOT_PLAY_UNIT_EVENT_SOUNDS = 0x01000000, CREATURE_TYPE_FLAG_HAS_NO_SHADOW_BLOB = 0x02000000, CREATURE_TYPE_FLAG_TREAT_AS_RAID_UNIT = 0x04000000, //! Creature can be targeted by spells that require target to be in caster's party/raid diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index 724e7c6fcda..ddf87fdda67 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -520,12 +520,12 @@ void MotionMaster::MoveSmoothPath(uint32 pointId, Movement::PointsArray const& p init.SetFly(); init.SetUncompressed(); } - + init.MovebyPath(path); init.SetSmooth(); init.SetWalk(walk); init.Launch(); - + // This code is not correct // EffectMovementGenerator does not affect UNIT_STATE_ROAMING | UNIT_STATE_ROAMING_MOVE // need to call PointMovementGenerator with various pointIds diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index fad8807a19c..019cfdc322f 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -377,7 +377,7 @@ class TC_GAME_API ItemScript : public ScriptObject // Called before casting a combat spell from this item (chance on hit spells of item template, can be used to prevent cast if returning false) virtual bool OnCastItemCombatSpell(Player* /*player*/, Unit* /*victim*/, SpellInfo const* /*spellInfo*/, Item* /*item*/) { return true; } - + }; class TC_GAME_API UnitScript : public ScriptObject diff --git a/src/server/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp index bbacce7ce26..a310d4d6ee0 100644 --- a/src/server/game/Scripting/ScriptSystem.cpp +++ b/src/server/game/Scripting/ScriptSystem.cpp @@ -109,7 +109,7 @@ void SystemMgr::LoadScriptSplineChains() uint16 chainId = fieldsMeta[1].GetUInt16(); uint8 splineId = fieldsMeta[2].GetUInt8(); SplineChain& chain = m_mSplineChainsMap[{entry,chainId}]; - + if (splineId != chain.size()) { TC_LOG_WARN("server.loading", "Creature #%u: Chain %u has orphaned spline %u, skipped.", entry, chainId, splineId); diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index ddc7f6a7e64..c098e605c9a 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -1309,9 +1309,9 @@ void OpcodeTable::Initialize() DEFINE_OPCODE_HANDLER(SMSG_WORLD_STATE_UI_TIMER_UPDATE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); DEFINE_OPCODE_HANDLER(SMSG_XP_GAIN_ABORTED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); DEFINE_OPCODE_HANDLER(SMSG_ZONE_UNDER_ATTACK, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); - - // Not implemented and/or missing - + + // Not implemented and/or missing + //DEFINE_OPCODE_HANDLER(CMSG_ACTIVE_PVP_CHEAT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); //DEFINE_OPCODE_HANDLER(CMSG_ADD_PVP_MEDAL_CHEAT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); //DEFINE_OPCODE_HANDLER(CMSG_ADVANCE_SPAWN_TIME, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 9877309bb27..369679684a1 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -2181,7 +2181,7 @@ void AuraEffect::HandleAuraTransform(AuraApplication const* aurApp, uint8 mode, { if (caster->HasAura(52648)) // Glyph of the Penguin model_id = 26452; - else if (caster->HasAura(57927)) // Glyph of the Monkey + else if (caster->HasAura(57927)) // Glyph of the Monkey model_id = 21362; } } @@ -6253,7 +6253,7 @@ void AuraEffect::HandleProcOnPowerAmountAuraProc(AuraApplication* aurApp, ProcEv if (triggerCaster->GetPower(powerRequired) != powerAmountRequired) return; - + uint32 triggerSpellId = GetSpellInfo()->Effects[GetEffIndex()].TriggerSpell; if (SpellInfo const* triggeredSpellInfo = sSpellMgr->GetSpellInfo(triggerSpellId)) { diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index cd19cb49f7b..5eb8c7ef72b 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -3803,13 +3803,13 @@ void Spell::EffectStuck(SpellEffIndex /*effIndex*/) if (player->IsInFlight()) return; - + // if player is dead without death timer is teleported to graveyard, otherwise not apply the effect if (player->isDead()) { if (!player->GetDeathTimer()) player->RepopAtGraveyard(); - + return; } @@ -3819,7 +3819,7 @@ void Spell::EffectStuck(SpellEffIndex /*effIndex*/) player->Kill(player); return; } - + player->TeleportTo(player->m_homebindMapId, player->m_homebindX, player->m_homebindY, player->m_homebindZ, player->GetOrientation(), TELE_TO_SPELL); // Stuck spell trigger Hearthstone cooldown diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 02a9f76944e..2a4f57bc584 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -3076,7 +3076,7 @@ bool SpellInfo::CanSpellProvideImmunityAgainstAura(SpellInfo const* auraSpellInf if (auraSpellInfo->Dispel == dispelImmunity) return true; - bool immuneToAllEffects = true; + bool immuneToAllEffects = true; for (uint8 effIndex = 0; effIndex < MAX_SPELL_EFFECTS; ++effIndex) { uint32 effectName = auraSpellInfo->Effects[effIndex].Effect; diff --git a/src/server/game/Storages/WhoListStorage.cpp b/src/server/game/Storages/WhoListStorage.cpp index c11886f6a5e..d8a17c334fa 100644 --- a/src/server/game/Storages/WhoListStorage.cpp +++ b/src/server/game/Storages/WhoListStorage.cpp @@ -54,8 +54,8 @@ void WhoListStorageMgr::Update() wstrToLower(wideGuildName); - _whoListStorage.emplace_back(itr->second->GetGUID(), itr->second->GetTeam(), itr->second->GetSession()->GetSecurity(), itr->second->getLevel(), - itr->second->getClass(), itr->second->getRace(), itr->second->GetZoneId(), itr->second->GetByteValue(PLAYER_BYTES_3, PLAYER_BYTES_3_OFFSET_GENDER), itr->second->IsVisible(), + _whoListStorage.emplace_back(itr->second->GetGUID(), itr->second->GetTeam(), itr->second->GetSession()->GetSecurity(), itr->second->getLevel(), + itr->second->getClass(), itr->second->getRace(), itr->second->GetZoneId(), itr->second->GetByteValue(PLAYER_BYTES_3, PLAYER_BYTES_3_OFFSET_GENDER), itr->second->IsVisible(), widePlayerName, wideGuildName, playerName, guildName); } } diff --git a/src/server/ipc/ZmqListener.h b/src/server/ipc/ZmqListener.h index 1dcb2beb8ef..19d120124f7 100644 --- a/src/server/ipc/ZmqListener.h +++ b/src/server/ipc/ZmqListener.h @@ -24,8 +24,8 @@ class TC_IPC_API ZmqListener : public ZMQTask { /* - * Read broadcasts from remote PUB socket, and forward them to - * another socket. + * Read broadcasts from remote PUB socket, and forward them to + * another socket. * * from - client SUB socket * to - listen PUSH socket diff --git a/src/server/ipc/ZmqMux.h b/src/server/ipc/ZmqMux.h index 6790e8c8ce2..02e49735c86 100644 --- a/src/server/ipc/ZmqMux.h +++ b/src/server/ipc/ZmqMux.h @@ -23,7 +23,7 @@ #include /* - * Multiplexes zmq messages from many threads, + * Multiplexes zmq messages from many threads, * and then passes them to another socket. */ class TC_IPC_API ZmqMux : public ZMQTask diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt index 27068a814bd..0ac99b9a977 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt @@ -94,7 +94,7 @@ if (USE_SCRIPTPCH) set(PRIVATE_PCH_SOURCE ScriptPCH.cpp) if (MSVC) list(INSERT PRIVATE_SOURCES 0 ScriptPCH.cpp) - endif (MSVC) + endif (MSVC) endif () GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp index 373a8181e4a..52f661da597 100644 --- a/src/server/scripts/Commands/cs_gobject.cpp +++ b/src/server/scripts/Commands/cs_gobject.cpp @@ -615,7 +615,7 @@ public: if (GameObjectDisplayInfoEntry const* modelInfo = sGameObjectDisplayInfoStore.LookupEntry(displayId)) handler->PSendSysMessage(LANG_GOINFO_MODEL, modelInfo->maxX, modelInfo->maxY, modelInfo->maxZ, modelInfo->minX, modelInfo->minY, modelInfo->minZ); - + return true; } diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index a1e7277aeef..ab0d83bfefe 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -547,7 +547,7 @@ public: Player* targetGroupLeader = nullptr; if (Group* targetGroup = target->GetGroup()) targetGroupLeader = ObjectAccessor::GetPlayer(map, targetGroup->GetLeaderGUID()); - + // check if far teleport is allowed if (!targetGroupLeader || (targetGroupLeader->GetMapId() != map->GetId()) || (targetGroupLeader->GetInstanceId() != map->GetInstanceId())) if ((targetMap->GetId() != map->GetId()) || (targetMap->GetInstanceId() != map->GetInstanceId())) diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 3e6a50b4556..3d80e6f88a9 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -1579,13 +1579,13 @@ public: handler->PSendSysMessage(LANG_COMMAND_NPC_SHOWLOOT_LABEL_2, "Per-player quest items"); _IterateNotNormalLootMap(handler, loot.GetPlayerQuestItems(), loot.quest_items); } - + if (!loot.GetPlayerFFAItems().empty()) { handler->PSendSysMessage(LANG_COMMAND_NPC_SHOWLOOT_LABEL_2, "FFA items per allowed player"); _IterateNotNormalLootMap(handler, loot.GetPlayerFFAItems(), loot.items); } - + if (!loot.GetPlayerNonQuestNonFFAConditionalItems().empty()) { handler->PSendSysMessage(LANG_COMMAND_NPC_SHOWLOOT_LABEL_2, "Per-player conditional items"); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index c57e83f67a0..5c492d9770e 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -688,7 +688,7 @@ public: switch (ExecuteSpeech_Counter) { - case 0: + case 0: Talk(SAY_EXEC_START, player); break; case 1: diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp index 08f5cc4aa9e..c14383ffaa5 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp @@ -68,7 +68,7 @@ public: switch (go->GetEntry()) { case 21099: DoorWardGUID = go->GetGUID(); break; - case 20920: go->SetFaction(FACTION_NONE); break; // big fat fugly hack + case 20920: go->SetFaction(FACTION_NONE); break; // big fat fugly hack } } diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp index 7635e0ec90b..5f0ecd6a595 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp @@ -121,7 +121,7 @@ class boss_corborus : public CreatureScript events.ScheduleEvent(EVENT_CORBORUS_CHARGE, 1000); break; - } + } default: break; } @@ -194,7 +194,7 @@ class boss_corborus : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); DoCast(me, SPELL_CLEAR_ALL_DEBUFFS); me->AttackStop(); - + DoCast(me, SPELL_SUBMERGE); countTrashingCharge = 0; @@ -302,7 +302,7 @@ class npc_rock_borer : public CreatureScript break; } } - + DoMeleeAttackIfReady(); } diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp index 576084e24ee..32adc791162 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp @@ -116,7 +116,7 @@ Position const GroundPos = { 1331.82f, 980.314f, 207.542f }; Position const AbovePlatformPos = { 1336.21f, 960.813f, 215.0f }; // TO-DO: -// - Find more sniffs and script Force Grip spell (79351) +// - Find more sniffs and script Force Grip spell (79351) class boss_high_priestess_azil : public CreatureScript { @@ -300,7 +300,7 @@ class boss_high_priestess_azil : public CreatureScript } }; -// 42428 - Devout Follower +// 42428 - Devout Follower class npc_devout_follower : public CreatureScript { public: diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp index 0a660f2e853..c915846da3b 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp @@ -160,7 +160,7 @@ class boss_ozruk : public CreatureScript me->AttackStop(); DoCast(me, SPELL_SHATTER); events.ScheduleEvent(EVENT_START_ATTACK, 4600); - // Spells are cast in same order everytime after Shatter, so we schedule them here + // Spells are cast in same order everytime after Shatter, so we schedule them here events.ScheduleEvent(EVENT_ELEMENTIUM_BULWARK, urand(3000,4000)); events.ScheduleEvent(EVENT_GROUND_SLAM, urand(7000,9000)); events.ScheduleEvent(EVENT_ELEMENTIUM_SPIKE_SHIELD, urand(10000,12000)); diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp index 0ff7b25f878..1074a39ea8a 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp @@ -46,7 +46,7 @@ enum Spells }; enum Entries -{ +{ NPC_LAVA_FISSURE = 43242, NPC_STALACTITE_TRIGGER_GROUND = 43357, NPC_STALACTITE_TRIGGER = 43159, @@ -182,7 +182,7 @@ class boss_slabhide : public CreatureScript { if (type != POINT_MOTION_TYPE && type != EFFECT_MOTION_TYPE) return; - + switch (id) { case POINT_SLABHIDE_INTRO: @@ -567,7 +567,7 @@ public: caster->GetGameObjectListWithEntryInGrid(goList, GO_STALACTITE, 40.0f); if (goList.empty()) return; - + unitList.remove_if(BehindObjectCheck(caster, goList)); } @@ -592,5 +592,5 @@ void AddSC_boss_slabhide() new spell_s81028_s80650_stalactite(); new spell_stalactite_mod_dest_height(); new spell_s92306_crystal_storm(); - new spell_s92300_crystal_storm(); + new spell_s92300_crystal_storm(); } diff --git a/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp b/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp index 7ac6afed0f9..c8624afa969 100644 --- a/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp @@ -218,7 +218,7 @@ class instance_stonecore : public InstanceMapScript GuidVector millhouseLastGroupGUIDs; ObjectGuid corborusRockDoorGUID; GuidVector slabhideRockWallGUIDs; - + EncounterState slabhideIntro = NOT_STARTED; }; diff --git a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp index 78156b5e45d..ae06479e000 100644 --- a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp @@ -44,7 +44,7 @@ enum Spells SPELL_TIGULE_AND_FORORS_SPECIAL_BLEND = 81220, SPELL_IMPENDING_DOOM = 86838, SPELL_IMPENDING_DOOM_CHANNEL = 86830, - + // SPELL_PORTAL_VISUAL = 79754, }; diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index c223d6b723b..919f008c108 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -150,7 +150,7 @@ public: return; } _guardianTrigger = (*summoned.begin())->GetGUID(); - + if (Creature* trigger = DoSummon(NPC_WORLD_TRIGGER, me->GetPosition(), 0u, TEMPSUMMON_MANUAL_DESPAWN)) _assassinTrigger = trigger->GetGUID(); else @@ -361,7 +361,7 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); me->RemoveAurasDueToSpell(SPELL_LEECHING_SWARM); DoCastSelf(SPELL_IMPALE_AURA, true); - + events.SetPhase(PHASE_SUBMERGE); switch (_nextSubmerge) { diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index 6b6184ae1af..67973d32a34 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -380,7 +380,7 @@ public: summons.Summon(summon); // Do not enter combat with zone } - + private: bool _enteredCombat; // has a player entered combat with the first crusher pack? (talk and spawn two more packs) bool _doorsWebbed; // obvious - have we reached the top and webbed the doors shut? (trigger for hadronox denied achievement) @@ -616,7 +616,7 @@ class npc_anub_ar_crusher_champion : public CreatureScript } }; -static const Position cryptFiendWaypoints[] = +static const Position cryptFiendWaypoints[] = { { 520.3911f, 548.7895f, 732.0118f, 5.0091f }, { }, diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index ad50bd65923..27b4e7702b1 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -918,7 +918,7 @@ class spell_gatewatcher_subboss_trigger : public SpellScriptLoader { public: spell_gatewatcher_subboss_trigger() : SpellScriptLoader("spell_gatewatcher_subboss_trigger") { } - + class spell_gatewatcher_subboss_trigger_SpellScript : public SpellScript { PrepareSpellScript(spell_gatewatcher_subboss_trigger_SpellScript); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp index a63a69d871e..09253883c6e 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -46,7 +46,7 @@ ObjectData const gameobjectData[] = { 0, 0 } // END }; -BossBoundaryData const boundaries = +BossBoundaryData const boundaries = { { DATA_KRIKTHIR, new RectangleBoundary(400.0f, 580.0f, 623.5f, 810.0f) }, { DATA_HADRONOX, new ZRangeBoundary(666.0f, 776.0f) }, diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index e3ab20f6af8..48459ffd3a6 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -555,7 +555,7 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); Talk(EMOTE_FEIGN_REVIVE); isFeignDeath = false; - + refreshBeam = true; // force beam refresh if (Creature* feugen = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_FEUGEN))) diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index b1d01218b3c..255d11361ab 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -705,7 +705,7 @@ enum MessengerTorvus { NPC_MESSENGER_TORVUS = 26649, QUEST_MESSAGE_FROM_THE_WEST = 12033, - + TALK_0 = 0 }; diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index b58670ef819..64b2b8618ea 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -45,7 +45,7 @@ enum Entries SPELL_HEALING_POTION = 17534, SPELL_BURN = 42685, - + EVENT_EMOTE_BEG = 1, EVENT_BEGIN = 2, EVENT_START_ESCORT = 3, diff --git a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp index 0cd382b08b4..7d851ec8bf7 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp @@ -289,7 +289,7 @@ public: me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, false); me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, false); ScheduleEvents(); - + // Attack the stored target if (Unit* oldTarget = ObjectAccessor::GetUnit(*me, _oldTargetGUID)) if (Unit* currentTarget = ObjectAccessor::GetUnit(*me, _targetGUID)) diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index eddbfe0e51b..28ff78217fd 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -844,7 +844,7 @@ class boss_kaelthas : public CreatureScript default: break; } - + if (me->HasUnitState(UNIT_STATE_CASTING) && !me->FindCurrentSpellBySpellId(SPELL_KAEL_GAINING_POWER) && !me->FindCurrentSpellBySpellId(SPELL_KAEL_STUNNED)) return; } diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 66612e424c6..b5401b2b31c 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -4125,9 +4125,9 @@ class spell_item_universal_remote : public SpellScriptLoader { uint8 chance = urand(0, 99); if (chance < 15) - GetCaster()->CastSpell(target, SPELL_TARGET_LOCK, true, GetCastItem()); + GetCaster()->CastSpell(target, SPELL_TARGET_LOCK, true, GetCastItem()); else if (chance < 25) - GetCaster()->CastSpell(target, SPELL_MOBILITY_MALFUNCTION, true, GetCastItem()); + GetCaster()->CastSpell(target, SPELL_MOBILITY_MALFUNCTION, true, GetCastItem()); else GetCaster()->CastSpell(target, SPELL_CONTROL_MACHINE, true, GetCastItem()); } @@ -4788,7 +4788,7 @@ void AddSC_item_spell_scripts() new spell_item_universal_remote(); new spell_item_zandalarian_charm("spell_item_unstable_power", SPELL_UNSTABLE_POWER_AURA_STACK); new spell_item_zandalarian_charm("spell_item_restless_strength", SPELL_RESTLESS_STRENGTH_AURA_STACK); - + new spell_item_mad_alchemists_potion(); new spell_item_crazy_alchemists_potion(); } diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index 672f4f5d424..9aa8f3cd5e3 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -1495,7 +1495,7 @@ class spell_mage_arcane_missiles_trigger : public SpellScriptLoader { public: spell_mage_arcane_missiles_trigger() : SpellScriptLoader("spell_mage_arcane_missiles_trigger") { } - + class spell_mage_arcane_missiles_trigger_AuraScript : public AuraScript { PrepareAuraScript(spell_mage_arcane_missiles_trigger_AuraScript); @@ -1504,7 +1504,7 @@ public: { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_ARCANE_MISSILES_AURASTATE)) @@ -1534,7 +1534,7 @@ public: AfterEffectRemove += AuraEffectRemoveFn(spell_mage_arcane_missiles_trigger_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - + AuraScript* GetAuraScript() const override { return new spell_mage_arcane_missiles_trigger_AuraScript(); diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index ec2f8260f25..bf609503e11 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -2506,7 +2506,7 @@ public: void HandleDummyEffect() { Unit* caster = GetCaster(); - + if (Creature* injuredStormwindInfantry = caster->FindNearestCreature(NPC_INJURED_STORMWIND_INFANTRY, 5.0f, true)) { injuredStormwindInfantry->SetCreatorGUID(caster->GetGUID()); diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index b9ba48236b7..3d5369b45ef 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -1167,7 +1167,7 @@ class go_toy_train_set : public GameObjectScript enum BrewfestMusic { EVENT_BREWFESTDWARF01 = 11810, // 1.35 min - EVENT_BREWFESTDWARF02 = 11812, // 1.55 min + EVENT_BREWFESTDWARF02 = 11812, // 1.55 min EVENT_BREWFESTDWARF03 = 11813, // 0.23 min EVENT_BREWFESTGOBLIN01 = 11811, // 1.08 min EVENT_BREWFESTGOBLIN02 = 11814, // 1.33 min @@ -1299,7 +1299,7 @@ public: enum MidsummerMusic { EVENTMIDSUMMERFIREFESTIVAL_A = 12319, // 1.08 min - EVENTMIDSUMMERFIREFESTIVAL_H = 12325, // 1.12 min + EVENTMIDSUMMERFIREFESTIVAL_H = 12325, // 1.12 min }; enum MidsummerMusicEvents diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp index db089e87d76..38fd29c5e5a 100644 --- a/src/server/scripts/World/npc_professions.cpp +++ b/src/server/scripts/World/npc_professions.cpp @@ -1014,7 +1014,7 @@ enum MultiProfessionTrainer GOSSIP_OPTION_SKINNING = 9, GOSSIP_OPTION_TAILORING = 10, GOSSIP_OPTION_MULTI = 11, - + GOSSIP_MENU_HERBALISM = 12188, GOSSIP_MENU_MINING = 12189, GOSSIP_MENU_SKINNING = 12190,