aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities
diff options
context:
space:
mode:
authorclick <click@gonnamakeyou.com>2012-02-18 16:52:08 +0100
committerclick <click@gonnamakeyou.com>2012-02-18 16:52:08 +0100
commit5411e1ce522b5a6f0faf2575fb96157bedeb5454 (patch)
tree28c9340987d224e8921ca7a9c5cb85e73eec6f45 /src/server/game/Entities
parentda5027ef3a4b7c89cb51841902dc3525c6c199f8 (diff)
Core: Clean up whitespace and tabs in the base sourcetree
Diffstat (limited to 'src/server/game/Entities')
-rwxr-xr-xsrc/server/game/Entities/GameObject/GameObject.h4
-rwxr-xr-xsrc/server/game/Entities/Player/Player.cpp2
-rwxr-xr-xsrc/server/game/Entities/Unit/Unit.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h
index a4635ca6dfb..a4fece4d301 100755
--- a/src/server/game/Entities/GameObject/GameObject.h
+++ b/src/server/game/Entities/GameObject/GameObject.h
@@ -710,7 +710,7 @@ class GameObject : public WorldObject, public GridObject<GameObject>
uint8 GetGoAnimProgress() const { return GetByteValue(GAMEOBJECT_BYTES_1, 3); }
void SetGoAnimProgress(uint8 animprogress) { SetByteValue(GAMEOBJECT_BYTES_1, 3, animprogress); }
static void SetGoArtKit(uint8 artkit, GameObject* go, uint32 lowguid = 0);
-
+
void SetPhaseMask(uint32 newPhaseMask, bool update);
void EnableCollision(bool enable);
@@ -795,7 +795,7 @@ class GameObject : public WorldObject, public GridObject<GameObject>
std::string GetAIName() const;
void SetDisplayId(uint32 displayid);
-
+
GameObjectModel * m_model;
protected:
bool AIM_Initialize();
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 941d898c1fb..42c0823c3da 100755
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -14828,7 +14828,7 @@ void Player::AddQuest(Quest const* quest, Object* questGiver)
uint16 log_slot = FindQuestSlot(0);
if (log_slot >= MAX_QUEST_LOG_SIZE) // Player does not have any free slot in the quest log
- return;
+ return;
uint32 quest_id = quest->GetQuestId();
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 4670a976e42..91263882a8c 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -14826,7 +14826,7 @@ Unit* Unit::SelectNearbyTarget(Unit* exclude, float dist) const
// remove current target
if (getVictim())
targets.remove(getVictim());
-
+
if (exclude)
targets.remove(exclude);