From 41c3193c6baeeb93c050d2b6f47ae1539887155e Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 16 May 2016 22:52:36 +0200 Subject: [PATCH] Core: Remove whitespaces --- src/server/game/AI/CreatureAI.cpp | 4 +-- src/server/game/AI/PlayerAI/PlayerAI.h | 2 +- .../game/AI/ScriptedAI/ScriptedCreature.cpp | 2 +- .../game/Entities/Creature/Creature.cpp | 6 ++-- src/server/game/Handlers/CalendarHandler.cpp | 2 +- src/server/game/Handlers/MiscHandler.cpp | 2 +- src/server/game/Instances/InstanceSaveMgr.cpp | 2 +- src/server/game/Spells/Spell.cpp | 2 +- src/server/scripts/Commands/cs_debug.cpp | 2 +- .../Karazhan/boss_midnight.cpp | 4 +-- .../RubySanctum/instance_ruby_sanctum.cpp | 2 +- .../Northrend/Naxxramas/boss_gothik.cpp | 10 +++---- .../Northrend/Naxxramas/boss_thaddius.cpp | 14 ++++----- .../Naxxramas/instance_naxxramas.cpp | 2 +- .../instance_utgarde_pinnacle.cpp | 2 +- src/server/scripts/World/duel_reset.cpp | 12 ++++---- src/server/scripts/World/go_scripts.cpp | 2 +- src/server/worldserver/worldserver.conf.dist | 30 +++++++++---------- 18 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp index 997a7695b6..4a00ee8114 100644 --- a/src/server/game/AI/CreatureAI.cpp +++ b/src/server/game/AI/CreatureAI.cpp @@ -285,7 +285,7 @@ bool CreatureAI::_EnterEvadeMode(EvadeReason /*why*/) int32 CreatureAI::VisualizeBoundary(uint32 duration, Unit* owner, bool fill) const { typedef std::pair coordinate; - + if (!owner) return -1; @@ -295,7 +295,7 @@ int32 CreatureAI::VisualizeBoundary(uint32 duration, Unit* owner, bool fill) con std::queue Q; std::unordered_set alreadyChecked; std::unordered_set outOfBounds; - + Position startPosition = owner->GetPosition(); if (!CheckBoundary(&startPosition)) // fall back to creature position { diff --git a/src/server/game/AI/PlayerAI/PlayerAI.h b/src/server/game/AI/PlayerAI/PlayerAI.h index 1820bcf11c..429bf1d856 100644 --- a/src/server/game/AI/PlayerAI/PlayerAI.h +++ b/src/server/game/AI/PlayerAI/PlayerAI.h @@ -28,7 +28,7 @@ class PlayerAI : public UnitAI explicit PlayerAI(Player* player) : UnitAI(static_cast(player)), me(player), _isSelfHealer(PlayerAI::IsPlayerHealer(player)), _isSelfRangedAttacker(PlayerAI::IsPlayerRangedAttacker(player)) { } void OnCharmed(bool /*apply*/) override { } // charm AI application for players is handled by Unit::SetCharmedBy / Unit::RemoveCharmedBy - + // helper functions to determine player info static bool IsPlayerHealer(Player const* who); bool IsHealer(Player const* who = nullptr) const { return (!who || who == me) ? _isSelfHealer : IsPlayerHealer(who); } diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index 608534f634..0d8c8fe024 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -566,7 +566,7 @@ void BossAI::_DespawnAtEvade(uint32 delayToRespawn) me->SetCorpseDelay(corpseDelay); me->SetRespawnDelay(respawnDelay); - if(instance) + if (instance) instance->SetBossState(_bossId, FAIL); } diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 51c60fd45f..a366ec27ee 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -2684,12 +2684,12 @@ bool Creature::FocusTarget(Spell const* focusSpell, WorldObject const* target) SetGuidValue(UNIT_FIELD_TARGET, newTarget); if (target) SetFacingToObject(target); - + if ( // here we determine if the (relatively expensive) forced update is worth it, or whether we can afford to wait until the scheduled update tick ( // only require instant update for spells that actually have a visual focusSpell->GetSpellInfo()->SpellVisual[0] || focusSpell->GetSpellInfo()->SpellVisual[1] - ) && ( + ) && ( !focusSpell->GetCastTime() || // if the spell is instant cast focusSpell->GetSpellInfo()->HasAttribute(SPELL_ATTR5_DONT_TURN_DURING_CAST) // client gets confused if we attempt to turn at the regularly scheduled update packet ) @@ -2716,7 +2716,7 @@ bool Creature::FocusTarget(Spell const* focusSpell, WorldObject const* target) if (target) SetInFront(target); else if (!canTurnDuringCast) - if(Unit* victim = GetVictim()) + if (Unit* victim = GetVictim()) SetInFront(victim); // ensure server-side orientation is correct at beginning of cast if (!canTurnDuringCast) diff --git a/src/server/game/Handlers/CalendarHandler.cpp b/src/server/game/Handlers/CalendarHandler.cpp index 8e895c0ba2..142e8c8283 100644 --- a/src/server/game/Handlers/CalendarHandler.cpp +++ b/src/server/game/Handlers/CalendarHandler.cpp @@ -705,7 +705,7 @@ void WorldSession::HandleSetSavedInstanceExtend(WorldPacket& recvData) InstancePlayerBind* instanceBind = player->GetBoundInstance(mapId, Difficulty(difficulty), toggleExtend == 1); // include expired instances if we are toggling extend on if (!instanceBind || !instanceBind->save || !instanceBind->perm) return; - + BindExtensionState newState; if (!toggleExtend || instanceBind->extendState == EXTEND_STATE_EXPIRED) newState = EXTEND_STATE_NORMAL; diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index 5aff6d4889..071a8b5046 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -959,7 +959,7 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket& recvData) default: break; } - + if (reviveAtTrigger) // check if the player is touching the areatrigger leading to the map his corpse is on if (!player->IsAlive() && player->HasCorpse()) if (player->GetCorpseLocation().GetMapId() == at->target_mapId) diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index 607f5b6b11..0ba8da4bdc 100644 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -449,7 +449,7 @@ time_t InstanceSaveManager::GetSubsequentResetTime(uint32 mapid, Difficulty diff TC_LOG_ERROR("misc", "InstanceSaveManager::GetSubsequentResetTime: not valid difficulty or no reset delay for map %u", mapid); return 0; } - + time_t diff = sWorld->getIntConfig(CONFIG_INSTANCE_RESET_TIME_HOUR) * HOUR; time_t period = uint32(((mapDiff->resetTime * sWorld->getRate(RATE_INSTANCE_RESET_TIME)) / DAY) * DAY); if (period < DAY) diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index f2ca7621ed..dfba984811 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -604,7 +604,7 @@ m_caster((info->HasAttribute(SPELL_ATTR6_CAST_BY_CHARMER) && caster->GetCharmerO //Auto Shot & Shoot (wand) m_autoRepeat = m_spellInfo->IsAutoRepeatRangedSpell(); - + m_isDelayedInstantCast = false; m_runesState = 0; diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index dd805b233f..7620d81c75 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -1462,7 +1462,7 @@ public: duration = 3 * MINUTE; bool doFill = fill_str ? (stricmp(fill_str, "FILL") == 0) : false; - + int32 errMsg = target->AI()->VisualizeBoundary(duration, player, doFill); if (errMsg > 0) handler->PSendSysMessage(errMsg); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index d4de862244..43ef7e006e 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -161,8 +161,8 @@ public: me->SetVisible(true); } - void EnterCombat(Unit* /*who*/) override - { + void EnterCombat(Unit* /*who*/) override + { if (InstanceScript* instance = me->GetInstanceScript()) instance->SetBossState(DATA_ATTUMEN, IN_PROGRESS); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp index a6cd8362db..739c3602f4 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp @@ -23,7 +23,7 @@ #include "WorldPacket.h" #include "ruby_sanctum.h" -BossBoundaryData const boundaries = +BossBoundaryData const boundaries = { { DATA_GENERAL_ZARITHRIAN, new EllipseBoundary(Position(3013.409f, 529.492f), 45.0, 100.0) }, { DATA_HALION, new CircleBoundary(Position(3156.037f, 533.2656f), 48.5) } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 5e6983c41c..30c05c9dca 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -65,7 +65,7 @@ enum Spells /* gothik phase two spells */ SPELL_HARVEST_SOUL = 28679, SPELL_SHADOW_BOLT = 29317, - + /* visual spells */ SPELL_ANCHOR_1_TRAINEE = 27892, SPELL_ANCHOR_1_DK = 27928, @@ -373,7 +373,7 @@ class boss_gothik : public CreatureScript instance->SetData(DATA_GOTHIK_GATE, GO_STATE_ACTIVE); Talk(EMOTE_GATE_OPENED); _gateIsOpen = true; - + for (ObjectGuid summonGuid : summons) { if (Creature* summon = ObjectAccessor::GetCreature(*me, summonGuid)) @@ -444,7 +444,7 @@ class boss_gothik : public CreatureScript TC_LOG_INFO("scripts", "GothikAI: Wave count %d is out of range for difficulty %d.", _waveCount, GetDifficulty()); break; } - + std::list triggers; me->GetCreatureListWithEntryInGrid(triggers, NPC_TRIGGER, 150.0f); for (GothikWaveEntry entry : RAID_MODE(waves10, waves25)[_waveCount].first) @@ -470,7 +470,7 @@ class boss_gothik : public CreatureScript default: targetDBGuid = 0; } - + for (Creature* trigger : triggers) if (trigger && trigger->GetSpawnId() == targetDBGuid) { @@ -548,7 +548,7 @@ class boss_gothik : public CreatureScript } } } - + private: uint32 _waveCount; bool _gateCanOpen; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index a197f113d9..d07b347948 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -253,7 +253,7 @@ public: events.SetPhase(PHASE_PETS); shockingEligibility = true; - + if (!instance->CheckRequiredBosses(BOSS_THADDIUS)) { BeginResetEncounter(); @@ -394,7 +394,7 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); me->SetReactState(REACT_AGGRESSIVE); - + DoZoneInCombat(); if (Unit* closest = SelectTarget(SELECT_TARGET_NEAREST, 0, 500.0f)) AttackStart(closest); @@ -620,7 +620,7 @@ public: damage = 0; return; } - + isFeignDeath = true; isOverloading = false; @@ -824,7 +824,7 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); Talk(EMOTE_FEIGN_REVIVE); isFeignDeath = false; - + refreshBeam = true; // force beam refresh if (Creature* stalagg = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_STALAGG))) @@ -956,7 +956,7 @@ public: magneticPullTimer = 20 * IN_MILLISECONDS; } else magneticPullTimer -= uiDiff; - + if (staticFieldTimer <= uiDiff) { DoCast(me, SPELL_FEUGEN_STATICFIELD); @@ -1005,7 +1005,7 @@ public: ObjectGuid _myCoil; ObjectGuid _myCoilGO; - + bool isOverloading; bool refreshBeam; bool isFeignDeath; @@ -1203,7 +1203,7 @@ class spell_thaddius_magnetic_pull : public SpellScriptLoader Unit* feugen = GetCaster(); if (!feugen || feugen->GetEntry() != NPC_FEUGEN) return; - + Unit* stalagg = ObjectAccessor::GetCreature(*feugen, feugen->GetInstanceScript()->GetGuidData(DATA_STALAGG)); if (!stalagg) return; diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index d7002b0c56..e397124851 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -20,7 +20,7 @@ #include "InstanceScript.h" #include "naxxramas.h" -BossBoundaryData const boundaries = +BossBoundaryData const boundaries = { /* Arachnid Quarter */ { BOSS_ANUBREKHAN, new CircleBoundary(Position(3273.376709f, -3475.876709f), Position(3195.668213f, -3475.930176f)) }, diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp index 8f2d5a6177..547dc681ac 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp @@ -19,7 +19,7 @@ #include "InstanceScript.h" #include "utgarde_pinnacle.h" -BossBoundaryData const boundaries = +BossBoundaryData const boundaries = { { DATA_KING_YMIRON, new RectangleBoundary(340.0f, 450.0f, -412.0f, -275.0f) } }; diff --git a/src/server/scripts/World/duel_reset.cpp b/src/server/scripts/World/duel_reset.cpp index 3c46255a1b..7982a5639e 100644 --- a/src/server/scripts/World/duel_reset.cpp +++ b/src/server/scripts/World/duel_reset.cpp @@ -98,7 +98,7 @@ class DuelResetScript : public PlayerScript static void ResetSpellCooldowns(Player* player, bool onStartDuel) { - if (onStartDuel) + if (onStartDuel) { // remove cooldowns on spells that have < 10 min CD > 30 sec and has no onHold player->GetSpellHistory()->ResetCooldowns([](SpellHistory::CooldownStorageType::iterator itr) -> bool @@ -106,8 +106,8 @@ class DuelResetScript : public PlayerScript SpellHistory::Clock::time_point now = SpellHistory::Clock::now(); uint32 cooldownDuration = itr->second.CooldownEnd > now ? std::chrono::duration_cast(itr->second.CooldownEnd - now).count() : 0; SpellInfo const* spellInfo = sSpellMgr->EnsureSpellInfo(itr->first); - return spellInfo->RecoveryTime < 10 * MINUTE * IN_MILLISECONDS - && spellInfo->CategoryRecoveryTime < 10 * MINUTE * IN_MILLISECONDS + return spellInfo->RecoveryTime < 10 * MINUTE * IN_MILLISECONDS + && spellInfo->CategoryRecoveryTime < 10 * MINUTE * IN_MILLISECONDS && !itr->second.OnHold && cooldownDuration > 0 && ( spellInfo->RecoveryTime - cooldownDuration ) > (MINUTE / 2) * IN_MILLISECONDS @@ -120,10 +120,10 @@ class DuelResetScript : public PlayerScript player->GetSpellHistory()->ResetCooldowns([](SpellHistory::CooldownStorageType::iterator itr) -> bool { SpellInfo const* spellInfo = sSpellMgr->EnsureSpellInfo(itr->first); - return spellInfo->RecoveryTime < 10 * MINUTE * IN_MILLISECONDS - && spellInfo->CategoryRecoveryTime < 10 * MINUTE * IN_MILLISECONDS + return spellInfo->RecoveryTime < 10 * MINUTE * IN_MILLISECONDS + && spellInfo->CategoryRecoveryTime < 10 * MINUTE * IN_MILLISECONDS && !itr->second.OnHold; - }, true); + }, true); } // pet cooldowns diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index dd129f0130..39266c1034 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -1140,7 +1140,7 @@ class go_toy_train_set : public GameObjectScript struct go_toy_train_setAI : public GameObjectAI { go_toy_train_setAI(GameObject* go) : GameObjectAI(go), _pulseTimer(3 * IN_MILLISECONDS) { } - + void UpdateAI(uint32 diff) override { if (diff < _pulseTimer) diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 2bb7802bf1..9d1636706f 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -3113,21 +3113,21 @@ AuctionHouseBot.Items.Yellow.Price.Ratio = 100 # Description: Percentage by which the price of items sold of each class is incremented / decreased (for all houses) # Default: 100 - (No change) -AuctionHouseBot.Class.Consumable.Price.Ratio = 100 -AuctionHouseBot.Class.Container.Price.Ratio = 100 -AuctionHouseBot.Class.Weapon.Price.Ratio = 100 -AuctionHouseBot.Class.Gem.Price.Ratio = 100 -AuctionHouseBot.Class.Armor.Price.Ratio = 100 -AuctionHouseBot.Class.Reagent.Price.Ratio = 100 -AuctionHouseBot.Class.Projectile.Price.Ratio = 100 -AuctionHouseBot.Class.TradeGood.Price.Ratio = 100 -AuctionHouseBot.Class.Generic.Price.Ratio = 100 -AuctionHouseBot.Class.Recipe.Price.Ratio = 100 -AuctionHouseBot.Class.Quiver.Price.Ratio = 100 -AuctionHouseBot.Class.Quest.Price.Ratio = 100 -AuctionHouseBot.Class.Key.Price.Ratio = 100 -AuctionHouseBot.Class.Misc.Price.Ratio = 100 -AuctionHouseBot.Class.Glyph.Price.Ratio = 100 +AuctionHouseBot.Class.Consumable.Price.Ratio = 100 +AuctionHouseBot.Class.Container.Price.Ratio = 100 +AuctionHouseBot.Class.Weapon.Price.Ratio = 100 +AuctionHouseBot.Class.Gem.Price.Ratio = 100 +AuctionHouseBot.Class.Armor.Price.Ratio = 100 +AuctionHouseBot.Class.Reagent.Price.Ratio = 100 +AuctionHouseBot.Class.Projectile.Price.Ratio = 100 +AuctionHouseBot.Class.TradeGood.Price.Ratio = 100 +AuctionHouseBot.Class.Generic.Price.Ratio = 100 +AuctionHouseBot.Class.Recipe.Price.Ratio = 100 +AuctionHouseBot.Class.Quiver.Price.Ratio = 100 +AuctionHouseBot.Class.Quest.Price.Ratio = 100 +AuctionHouseBot.Class.Key.Price.Ratio = 100 +AuctionHouseBot.Class.Misc.Price.Ratio = 100 +AuctionHouseBot.Class.Glyph.Price.Ratio = 100 # # AuctionHouseBot.Items.ItemLevel.*