From 452b3d9e0543c90e4878d34200aae66f225cfea1 Mon Sep 17 00:00:00 2001 From: zergtmn Date: Sun, 16 Jan 2011 01:34:11 +0500 Subject: [PATCH] [11041] Tabs to spaces --- src/game/BattleGroundEY.cpp | 2 +- src/game/Camera.cpp | 2 +- src/game/SpellAuras.cpp | 18 +++++++++--------- src/game/SpellAuras.h | 2 +- src/shared/revision_nr.h | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/game/BattleGroundEY.cpp b/src/game/BattleGroundEY.cpp index 7cf7b1d29..aea2240e0 100644 --- a/src/game/BattleGroundEY.cpp +++ b/src/game/BattleGroundEY.cpp @@ -181,7 +181,7 @@ void BattleGroundEY::CheckSomeoneLeftPoint() !plr->IsWithinDist3d(BG_EY_NodePositions[i][0], BG_EY_NodePositions[i][1], BG_EY_NodePositions[i][2], BG_EY_POINT_RADIUS)) //move player out of point (add him to players that are out of points { - m_PlayersNearPoint[BG_EY_PLAYERS_OUT_OF_POINTS].push_back(m_PlayersNearPoint[i][j]); + m_PlayersNearPoint[BG_EY_PLAYERS_OUT_OF_POINTS].push_back(m_PlayersNearPoint[i][j]); m_PlayersNearPoint[i].erase(m_PlayersNearPoint[i].begin() + j); UpdateWorldStateForPlayer(PROGRESS_BAR_SHOW, BG_EY_PROGRESS_BAR_DONT_SHOW, plr); } diff --git a/src/game/Camera.cpp b/src/game/Camera.cpp index 5cf39b4cb..8eb2093d4 100644 --- a/src/game/Camera.cpp +++ b/src/game/Camera.cpp @@ -31,7 +31,7 @@ Camera::Camera(Player* pl) : m_owner(*pl), m_source(pl) Camera::~Camera() { // view of camera should be already reseted to owner (RemoveFromWorld -> Event_RemovedFromWorld -> ResetView) - MANGOS_ASSERT(m_source == &m_owner); + MANGOS_ASSERT(m_source == &m_owner); // for symmetry with constructor and way to make viewpoint's list empty m_source->GetViewPoint().Detach(this); diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index cf38fb6b4..3e9151f32 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -7992,18 +7992,18 @@ void Aura::HandleAuraModAllCritChance(bool apply, bool Real) ((Player*)target)->UpdateAllSpellCritChances(); } -void Aura::SetAuraMaxDuration( int32 duration ) +void Aura::SetAuraMaxDuration(int32 duration) { - m_maxduration = duration; + m_maxduration = duration; - // possible overwrite persistent state - if (duration > 0) - { - if (!(GetHolder()->IsPassive() && GetSpellProto()->DurationIndex == 0)) - GetHolder()->SetPermanent(false); + // possible overwrite persistent state + if (duration > 0) + { + if (!(GetHolder()->IsPassive() && GetSpellProto()->DurationIndex == 0)) + GetHolder()->SetPermanent(false); - GetHolder()->SetAuraFlags(GetHolder()->GetAuraFlags() | AFLAG_DURATION); - } + GetHolder()->SetAuraFlags(GetHolder()->GetAuraFlags() | AFLAG_DURATION); + } } bool Aura::IsLastAuraOnHolder() diff --git a/src/game/SpellAuras.h b/src/game/SpellAuras.h index 991d011f8..9812dd2cc 100644 --- a/src/game/SpellAuras.h +++ b/src/game/SpellAuras.h @@ -77,7 +77,7 @@ class MANGOS_DLL_SPEC SpellAuraHolder void SetTarget(Unit* target) { m_target = target; } bool IsPermanent() const { return m_permanent; } - void SetPermanent (bool permanent) { m_permanent = permanent; } + void SetPermanent(bool permanent) { m_permanent = permanent; } bool IsPassive() const { return m_isPassive; } bool IsDeathPersistent() const { return m_isDeathPersist; } bool IsPersistent() const; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 3855fbe5d..c8c4a69c9 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 "11040" + #define REVISION_NR "11041" #endif // __REVISION_NR_H__