mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 19:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11041] Tabs to spaces

Browse source
This commit is contained in:
zergtmn 2011-01-16 01:34:11 +05:00
parent bf04f46011
commit 452b3d9e05
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/BattleGroundEY.cpp
View file

@ -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)) !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 //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); m_PlayersNearPoint[i].erase(m_PlayersNearPoint[i].begin() + j);
UpdateWorldStateForPlayer(PROGRESS_BAR_SHOW, BG_EY_PROGRESS_BAR_DONT_SHOW, plr); UpdateWorldStateForPlayer(PROGRESS_BAR_SHOW, BG_EY_PROGRESS_BAR_DONT_SHOW, plr);
} }

2
src/game/Camera.cpp
View file

@ -31,7 +31,7 @@ Camera::Camera(Player* pl) : m_owner(*pl), m_source(pl)
Camera::~Camera() Camera::~Camera()
{ {
// view of camera should be already reseted to owner (RemoveFromWorld -> Event_RemovedFromWorld -> ResetView) // 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 // for symmetry with constructor and way to make viewpoint's list empty
m_source->GetViewPoint().Detach(this); m_source->GetViewPoint().Detach(this);

18
src/game/SpellAuras.cpp
View file

@ -7992,18 +7992,18 @@ void Aura::HandleAuraModAllCritChance(bool apply, bool Real)
((Player*)target)->UpdateAllSpellCritChances(); ((Player*)target)->UpdateAllSpellCritChances();
} }
void Aura::SetAuraMaxDuration( int32 duration ) void Aura::SetAuraMaxDuration(int32 duration)
{ {
m_maxduration = duration; m_maxduration = duration;
// possible overwrite persistent state // possible overwrite persistent state
if (duration > 0) if (duration > 0)
{ {
if (!(GetHolder()->IsPassive() && GetSpellProto()->DurationIndex == 0)) if (!(GetHolder()->IsPassive() && GetSpellProto()->DurationIndex == 0))
GetHolder()->SetPermanent(false); GetHolder()->SetPermanent(false);
GetHolder()->SetAuraFlags(GetHolder()->GetAuraFlags() | AFLAG_DURATION); GetHolder()->SetAuraFlags(GetHolder()->GetAuraFlags() | AFLAG_DURATION);
} }
} }
bool Aura::IsLastAuraOnHolder() bool Aura::IsLastAuraOnHolder()

2
src/game/SpellAuras.h
View file

@ -77,7 +77,7 @@ class MANGOS_DLL_SPEC SpellAuraHolder
void SetTarget(Unit* target) { m_target = target; } void SetTarget(Unit* target) { m_target = target; }
bool IsPermanent() const { return m_permanent; } 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 IsPassive() const { return m_isPassive; }
bool IsDeathPersistent() const { return m_isDeathPersist; } bool IsDeathPersistent() const { return m_isDeathPersist; }
bool IsPersistent() const; bool IsPersistent() const;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11040" #define REVISION_NR "11041"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__