aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Pools
diff options
context:
space:
mode:
authorMachiavelli <machiavelli.trinity@gmail.com>2012-04-08 17:40:05 +0200
committerMachiavelli <machiavelli.trinity@gmail.com>2012-04-08 17:40:05 +0200
commitbc96df1aae35d2a887ae58f85aeadf0049077b2b (patch)
treee7364e2bc0ce4f06d352136724263a6f06a4b4e2 /src/server/game/Pools
parente636531da3603c10a9ebcb8a55d52d6cdb3a400a (diff)
Core/Shared: Move container functions to shared project under Trinity::Container namespace. Also implement RandomResizeList which takes a predicate function as parameter.
Core/ScriptedAI: Extend SummonList::DoAction to take a predicate function as parameter and allow specifying a maximum number of units to be selected.
Diffstat (limited to 'src/server/game/Pools')
-rwxr-xr-xsrc/server/game/Pools/PoolMgr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp
index 5ebf78e484c..d8548b552d3 100755
--- a/src/server/game/Pools/PoolMgr.cpp
+++ b/src/server/game/Pools/PoolMgr.cpp
@@ -479,7 +479,7 @@ void PoolGroup<Quest>::SpawnObject(ActivePoolData& spawns, uint32 limit, uint32
{
do
{
- uint32 questId = SelectRandomContainerElement(currentQuests);
+ uint32 questId = Trinity::Containers::SelectRandomContainerElement(currentQuests);
newQuests.insert(questId);
currentQuests.erase(questId);
} while (newQuests.size() < limit && !currentQuests.empty()); // failsafe
@@ -491,7 +491,7 @@ void PoolGroup<Quest>::SpawnObject(ActivePoolData& spawns, uint32 limit, uint32
// activate <limit> random quests
do
{
- uint32 questId = SelectRandomContainerElement(newQuests);
+ uint32 questId = Trinity::Containers::SelectRandomContainerElement(newQuests);
spawns.ActivateObject<Quest>(questId, poolId);
PoolObject tempObj(questId, 0.0f);
Spawn1Object(&tempObj);