diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2019-08-04 12:22:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-04 12:22:57 +0200 |
| commit | a5e73e41c0e813e674bb0a644e0052052435494e (patch) | |
| tree | cabbeadc1e07635f1a8fc53599895613cbe61723 /src/server/scripts/Northrend | |
| parent | 15e85f882fdb7b5d1d48302907e76c993ee4e923 (diff) | |
Core/Pooling: Quest pooling rewrite: (PR#23627)
- Split quest pooling from PoolMgr (into QuestPoolMgr)
- Proper saving/restoring on server restart
- No more hacking into sObjectMgr to insert/remove available quests
Diffstat (limited to 'src/server/scripts/Northrend')
| -rw-r--r-- | src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index 720e5e23d0f..9048485cbe4 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -22,7 +22,7 @@ #include "MotionMaster.h" #include "ObjectAccessor.h" #include "Player.h" -#include "PoolMgr.h" +#include "QuestPools.h" #include "ScriptedCreature.h" #include "SpellInfo.h" #include "SpellScript.h" @@ -512,7 +512,7 @@ class boss_lady_deathwhisper : public CreatureScript uint8 addIndexOther = uint8(addIndex ^ 1); // Summon first add, replace it with Darnavan if weekly quest is active - if (_waveCounter || !sPoolMgr->IsSpawnedObject<Quest>(QUEST_DEPROGRAMMING)) + if (_waveCounter || !sQuestPoolMgr->IsQuestActive(QUEST_DEPROGRAMMING)) Summon(SummonEntries[addIndex], SummonPositions[addIndex * 3]); else Summon(NPC_DARNAVAN, SummonPositions[addIndex * 3]); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 3f9d142be08..a3c150b9de6 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -23,7 +23,7 @@ #include "Map.h" #include "ObjectMgr.h" #include "Player.h" -#include "PoolMgr.h" +#include "QuestPools.h" #include "ScriptMgr.h" #include "TemporarySummon.h" #include "Transport.h" @@ -346,7 +346,7 @@ class instance_icecrown_citadel : public InstanceMapScript if (WeeklyQuestData[questIndex].creatureEntry == entry) { uint8 diffIndex = uint8(instance->GetSpawnMode() & 1); - if (!sPoolMgr->IsSpawnedObject<Quest>(WeeklyQuestData[questIndex].questId[diffIndex])) + if (!sQuestPoolMgr->IsQuestActive(WeeklyQuestData[questIndex].questId[diffIndex])) return 0; break; } @@ -974,7 +974,7 @@ class instance_icecrown_citadel : public InstanceMapScript case DATA_VALITHRIA_DREAMWALKER: if (state == DONE) { - if (sPoolMgr->IsSpawnedObject<Quest>(WeeklyQuestData[8].questId[instance->GetSpawnMode() & 1])) + if (sQuestPoolMgr->IsQuestActive(WeeklyQuestData[8].questId[instance->GetSpawnMode() & 1])) instance->SummonCreature(NPC_VALITHRIA_DREAMWALKER_QUEST, ValithriaSpawnPos); if (GameObject* teleporter = instance->GetGameObject(TeleporterSindragosaGUID)) SetTeleporterState(teleporter, true); @@ -1070,7 +1070,7 @@ class instance_icecrown_citadel : public InstanceMapScript break; // 5 is the index of Blood Quickening - if (!sPoolMgr->IsSpawnedObject<Quest>(WeeklyQuestData[5].questId[instance->GetSpawnMode() & 1])) + if (!sQuestPoolMgr->IsQuestActive(WeeklyQuestData[5].questId[instance->GetSpawnMode() & 1])) break; switch (data) |
