Skip to content

Commit

Permalink
Core: Remove whitespaces
Browse files Browse the repository at this point in the history
(cherry picked from commit 5e74c22)
  • Loading branch information
Vincent-Michael authored and Shauren committed Apr 9, 2016
1 parent 307a938 commit 179b521
Show file tree
Hide file tree
Showing 13 changed files with 37 additions and 37 deletions.
4 changes: 2 additions & 2 deletions src/server/game/AI/CreatureAI.cpp
Expand Up @@ -283,7 +283,7 @@ bool CreatureAI::_EnterEvadeMode(EvadeReason /*why*/)
int32 CreatureAI::VisualizeBoundary(uint32 duration, Unit* owner, bool fill) const
{
typedef std::pair<int32, int32> coordinate;

if (!owner)
return -1;

Expand All @@ -293,7 +293,7 @@ int32 CreatureAI::VisualizeBoundary(uint32 duration, Unit* owner, bool fill) con
std::queue<coordinate> Q;
std::unordered_set<coordinate> alreadyChecked;
std::unordered_set<coordinate> outOfBounds;

Position startPosition = owner->GetPosition();
if (!CheckBoundary(&startPosition)) // fall back to creature position
{
Expand Down
2 changes: 1 addition & 1 deletion src/server/game/AI/PlayerAI/PlayerAI.h
Expand Up @@ -28,7 +28,7 @@ class TC_GAME_API PlayerAI : public UnitAI
explicit PlayerAI(Player* player) : UnitAI(static_cast<Unit*>(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); }
Expand Down
2 changes: 1 addition & 1 deletion src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
Expand Up @@ -555,7 +555,7 @@ void BossAI::_DespawnAtEvade(uint32 delayToRespawn)
me->SetCorpseDelay(corpseDelay);
me->SetRespawnDelay(respawnDelay);

if(instance)
if (instance)
instance->SetBossState(_bossId, FAIL);
}

Expand Down
2 changes: 1 addition & 1 deletion src/server/game/Entities/Creature/Creature.cpp
Expand Up @@ -2736,7 +2736,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)
Expand Down
2 changes: 1 addition & 1 deletion src/server/game/Server/WorldSession.cpp
Expand Up @@ -393,7 +393,7 @@ bool WorldSession::Update(uint32 diff, PacketFilter& updater)
LogUnexpectedOpcode(packet, "STATUS_TRANSFER", "the player has not logged in yet");
else if (_player->IsInWorld())
LogUnexpectedOpcode(packet, "STATUS_TRANSFER", "the player is still in world");
else if(AntiDOS.EvaluateOpcode(*packet, currentTime))
else if (AntiDOS.EvaluateOpcode(*packet, currentTime))
{
sScriptMgr->OnPacketReceive(this, *packet);
opHandle->Call(this, *packet);
Expand Down
2 changes: 1 addition & 1 deletion src/server/game/Spells/Spell.cpp
Expand Up @@ -598,7 +598,7 @@ m_spellValue(new SpellValue(caster->GetMap()->GetDifficultyID(), m_spellInfo)),

//Auto Shot & Shoot (wand)
m_autoRepeat = m_spellInfo->IsAutoRepeatRangedSpell();

m_isDelayedInstantCast = false;

m_runesState = 0;
Expand Down
4 changes: 2 additions & 2 deletions src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
Expand Up @@ -161,8 +161,8 @@ class boss_midnight : public CreatureScript
me->SetVisible(true);
}

void EnterCombat(Unit* /*who*/) override
{
void EnterCombat(Unit* /*who*/) override
{
if (InstanceScript* instance = me->GetInstanceScript())
instance->SetBossState(DATA_ATTUMEN, IN_PROGRESS);
}
Expand Down
Expand Up @@ -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) }
Expand Down
18 changes: 9 additions & 9 deletions src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
Expand Up @@ -169,7 +169,7 @@ class boss_thaddius : public CreatureScript
boss_thaddiusAI(Creature* creature) : BossAI(creature, BOSS_THADDIUS), stalaggAlive(true), feugenAlive(true), ballLightningEnabled(false), shockingEligibility(true)
{
if (instance->GetBossState(BOSS_THADDIUS) != DONE)
{
{
events.SetPhase(PHASE_NOT_ENGAGED);
SetCombatMovement(false);

Expand Down Expand Up @@ -223,7 +223,7 @@ class boss_thaddius : public CreatureScript
events.SetPhase(PHASE_PETS);

shockingEligibility = true;

if (!instance->CheckRequiredBosses(BOSS_THADDIUS))
return BeginResetEncounter();
instance->SetBossState(BOSS_THADDIUS, IN_PROGRESS);
Expand Down Expand Up @@ -365,7 +365,7 @@ class boss_thaddius : public CreatureScript
me->RemoveAura(SPELL_THADDIUS_INACTIVE_VISUAL);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);

DoZoneInCombat();
if (Unit* closest = SelectTarget(SELECT_TARGET_NEAREST, 0, 500.0f))
AttackStart(closest);
Expand Down Expand Up @@ -521,7 +521,7 @@ class npc_stalagg : public CreatureScript
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)))
Expand Down Expand Up @@ -586,7 +586,7 @@ class npc_stalagg : public CreatureScript
damage = 0;
return;
}

isFeignDeath = true;
isOverloading = false;

Expand Down Expand Up @@ -790,7 +790,7 @@ class npc_feugen : public CreatureScript
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)))
Expand Down Expand Up @@ -922,7 +922,7 @@ class npc_feugen : public CreatureScript
magneticPullTimer = 20 * IN_MILLISECONDS;
}
else magneticPullTimer -= uiDiff;

if (staticFieldTimer <= uiDiff)
{
DoCast(me, SPELL_FEUGEN_STATICFIELD);
Expand Down Expand Up @@ -971,7 +971,7 @@ class npc_feugen : public CreatureScript

ObjectGuid _myCoil;
ObjectGuid _myCoilGO;

bool isOverloading;
bool refreshBeam;
bool isFeignDeath;
Expand Down Expand Up @@ -1169,7 +1169,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;
Expand Down
Expand Up @@ -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)) },
Expand Down
Expand Up @@ -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) }
};
Expand Down
2 changes: 1 addition & 1 deletion src/server/scripts/World/go_scripts.cpp
Expand Up @@ -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)
Expand Down
30 changes: 15 additions & 15 deletions src/server/worldserver/worldserver.conf.dist
Expand Up @@ -3134,21 +3134,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.*
Expand Down

0 comments on commit 179b521

Please sign in to comment.