From 6fe36efe0f2a05421965ad57c69b2f950a2cdb72 Mon Sep 17 00:00:00 2001 From: Rat Date: Sun, 20 Dec 2009 15:20:04 +0100 Subject: *apply trinity style to whole source *comment out all mangos to trinity defines *this will make merging a little harder, but code will be more clear --HG-- branch : trunk --- src/game/GameObject.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/game/GameObject.cpp') diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index 5110d2e23d9..e3794de8a8e 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -358,8 +358,8 @@ void GameObject::Update(uint32 /*p_time*/) // environmental damage spells already have around enemies targeting but this not help in case not existed GO casting support // affect only players Player* player = NULL; - MaNGOS::AnyPlayerInObjectRangeCheck checker(this, radius); - MaNGOS::PlayerSearcher searcher(this, player, checker); + Trinity::AnyPlayerInObjectRangeCheck checker(this, radius); + Trinity::PlayerSearcher searcher(this, player, checker); VisitNearbyWorldObject(radius, searcher); ok = player; } @@ -867,8 +867,8 @@ void GameObject::TriggeringLinkedGameObject(uint32 trapEntry, Unit* target) Cell cell(p); cell.data.Part.reserved = ALL_DISTRICT; - MaNGOS::NearestGameObjectEntryInObjectRangeCheck go_check(*target,trapEntry,range); - MaNGOS::GameObjectLastSearcher checker(this, trapGO,go_check); + Trinity::NearestGameObjectEntryInObjectRangeCheck go_check(*target,trapEntry,range); + Trinity::GameObjectLastSearcher checker(this, trapGO,go_check); TypeContainerVisitor, GridTypeMapContainer > object_checker(checker); CellLock cell_lock(cell, p); @@ -888,8 +888,8 @@ GameObject* GameObject::LookupFishingHoleAround(float range) CellPair p(Trinity::ComputeCellPair(GetPositionX(),GetPositionY())); Cell cell(p); cell.data.Part.reserved = ALL_DISTRICT; - MaNGOS::NearestGameObjectFishingHole u_check(*this, range); - MaNGOS::GameObjectSearcher checker(this, ok, u_check); + Trinity::NearestGameObjectFishingHole u_check(*this, range); + Trinity::GameObjectSearcher checker(this, ok, u_check); CellLock cell_lock(cell, p); -- cgit v1.2.3