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/Creature.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/game/Creature.cpp') diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 579e8fd28bc..59ad2930c30 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -654,14 +654,14 @@ void Creature::DoFleeToGetAssistance() { Creature* pCreature = NULL; - CellPair p(MaNGOS::ComputeCellPair(GetPositionX(), GetPositionY())); + CellPair p(Trinity::ComputeCellPair(GetPositionX(), GetPositionY())); Cell cell(p); cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); - MaNGOS::NearestAssistCreatureInCreatureRangeCheck u_check(this, getVictim(), radius); - MaNGOS::CreatureLastSearcher searcher(this, pCreature, u_check); + Trinity::NearestAssistCreatureInCreatureRangeCheck u_check(this, getVictim(), radius); + Trinity::CreatureLastSearcher searcher(this, pCreature, u_check); - TypeContainerVisitor, GridTypeMapContainer > grid_creature_searcher(searcher); + TypeContainerVisitor, GridTypeMapContainer > grid_creature_searcher(searcher); CellLock cell_lock(cell, p); cell_lock->Visit(cell_lock, grid_creature_searcher, *GetMap(), *this, radius); @@ -1756,8 +1756,8 @@ void Creature::CallAssistance() cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); - MaNGOS::AnyAssistCreatureInRangeCheck u_check(this, getVictim(), radius); - MaNGOS::CreatureListSearcher searcher(this, assistList, u_check); + Trinity::AnyAssistCreatureInRangeCheck u_check(this, getVictim(), radius); + Trinity::CreatureListSearcher searcher(this, assistList, u_check); TypeContainerVisitor, GridTypeMapContainer > grid_creature_searcher(searcher); @@ -1785,15 +1785,15 @@ void Creature::CallForHelp(float fRadius) if (fRadius <= 0.0f || !getVictim() || isPet() || isCharmed()) return; - CellPair p(MaNGOS::ComputeCellPair(GetPositionX(), GetPositionY())); + CellPair p(Trinity::ComputeCellPair(GetPositionX(), GetPositionY())); Cell cell(p); cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); - MaNGOS::CallOfHelpCreatureInRangeDo u_do(this, getVictim(), fRadius); - MaNGOS::CreatureWorker worker(this, u_do); + Trinity::CallOfHelpCreatureInRangeDo u_do(this, getVictim(), fRadius); + Trinity::CreatureWorker worker(this, u_do); - TypeContainerVisitor, GridTypeMapContainer > grid_creature_searcher(worker); + TypeContainerVisitor, GridTypeMapContainer > grid_creature_searcher(worker); CellLock cell_lock(cell, p); cell_lock->Visit(cell_lock, grid_creature_searcher, *GetMap(), *this, fRadius); -- cgit v1.2.3