Cleaned up and unified various sort predicates and moved them to Trinity namespace, replaced priority queues with sorts and purged some unused code.

--HG--
branch : trunk

3 files changed, 3 insertions, 3 deletions

diff --git a/src/scripts/outland/black_temple/boss_bloodboil.cpp b/src/scripts/outland/black_temple/boss_bloodboil.cpp
index bf948a81e2d..1093ce06cb8 100644
--- a/src/scripts/outland/black_temple/boss_bloodboil.cpp
+++ b/src/scripts/outland/black_temple/boss_bloodboil.cpp
@@ -146,7 +146,7 @@ struct boss_gurtogg_bloodboilAI : public ScriptedAI
         }
 
         //Sort the list of players
-        targets.sort(ObjectDistanceOrderReversed(me));
+        targets.sort(Trinity::ObjectDistanceOrderPred(me, false));
         //Resize so we only get top 5
         targets.resize(5);
 
diff --git a/src/scripts/outland/black_temple/boss_reliquary_of_souls.cpp b/src/scripts/outland/black_temple/boss_reliquary_of_souls.cpp
index 75dd799458c..3e019a8dc35 100644
--- a/src/scripts/outland/black_temple/boss_reliquary_of_souls.cpp
+++ b/src/scripts/outland/black_temple/boss_reliquary_of_souls.cpp
@@ -399,7 +399,7 @@ struct boss_essence_of_sufferingAI : public ScriptedAI
         }
         if (targets.empty())
             return; // No targets added for some reason. No point continuing.
-        targets.sort(ObjectDistanceOrder(me)); // Sort players by distance.
+        targets.sort(Trinity::ObjectDistanceOrderPred(me)); // Sort players by distance.
         targets.resize(1); // Only need closest target.
         Unit *pTarget = targets.front(); // Get the first target.
         if (pTarget)
diff --git a/src/scripts/outland/black_temple/boss_teron_gorefiend.cpp b/src/scripts/outland/black_temple/boss_teron_gorefiend.cpp
index a61735f0a25..4c3887e2ba3 100644
--- a/src/scripts/outland/black_temple/boss_teron_gorefiend.cpp
+++ b/src/scripts/outland/black_temple/boss_teron_gorefiend.cpp
@@ -153,7 +153,7 @@ struct mob_shadowy_constructAI : public ScriptedAI
             if (pUnit && pUnit->isAlive())
                 targets.push_back(pUnit);
         }
-        targets.sort(ObjectDistanceOrder(me));
+        targets.sort(Trinity::ObjectDistanceOrderPred(me));
         Unit *pTarget = targets.front();
         if (pTarget && me->IsWithinDistInMap(pTarget, me->GetAttackDistance(pTarget)))
         {