aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/server/game/DungeonFinding/LFGMgr.cpp6
-rw-r--r--src/server/game/DungeonFinding/LFGMgr.h2
-rw-r--r--src/server/game/Instances/InstanceScript.cpp37
-rw-r--r--src/server/game/Instances/InstanceScript.h6
4 files changed, 27 insertions, 24 deletions
diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp
index 5ae5208d3db..5dc01536bf6 100644
--- a/src/server/game/DungeonFinding/LFGMgr.cpp
+++ b/src/server/game/DungeonFinding/LFGMgr.cpp
@@ -1445,10 +1445,10 @@ void LFGMgr::TeleportPlayer(Player* player, bool out, bool fromOpcode /*= false*
Check if dungeon can be rewarded, if any.
@param[in] gguid Group guid
- @param[in] dungeonEncounterIds DungeonEncounter that was just completed
+ @param[in] dungeonEncounters DungeonEncounter that was just completed
@param[in] currMap Map of the instance where encounter was completed
*/
-void LFGMgr::OnDungeonEncounterDone(ObjectGuid gguid, std::array<uint32, 4> const& dungeonEncounterIds, Map const* currMap)
+void LFGMgr::OnDungeonEncounterDone(ObjectGuid gguid, std::span<uint32 const> dungeonEncounters, Map const* currMap)
{
if (GetState(gguid) == LFG_STATE_FINISHED_DUNGEON) // Shouldn't happen. Do not reward multiple times
{
@@ -1459,7 +1459,7 @@ void LFGMgr::OnDungeonEncounterDone(ObjectGuid gguid, std::array<uint32, 4> cons
uint32 gDungeonId = GetDungeon(gguid);
LFGDungeonData const* dungeonDone = GetLFGDungeon(gDungeonId);
// LFGDungeons can point to a DungeonEncounter from any difficulty so we need this kind of lenient check
- if (!dungeonDone->finalDungeonEncounterId || !advstd::ranges::contains(dungeonEncounterIds, dungeonDone->finalDungeonEncounterId))
+ if (!advstd::ranges::contains(dungeonEncounters, dungeonDone->finalDungeonEncounterId))
return;
FinishDungeon(gguid, gDungeonId, currMap);
diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h
index 147de7abd44..b31b1d1b9ac 100644
--- a/src/server/game/DungeonFinding/LFGMgr.h
+++ b/src/server/game/DungeonFinding/LFGMgr.h
@@ -333,7 +333,7 @@ class TC_GAME_API LFGMgr
// World.cpp
/// Check dungeon completion on encounter completion
- void OnDungeonEncounterDone(ObjectGuid gguid, std::array<uint32, 4> const& dungeonEncounterId, Map const* currMap);
+ void OnDungeonEncounterDone(ObjectGuid gguid, std::span<uint32 const> dungeonEncounters, Map const* currMap);
/// Finish the dungeon for the given group. All check are performed using internal lfg data
void FinishDungeon(ObjectGuid gguid, uint32 dungeonId, Map const* currMap);
/// Loads rewards for random dungeons
diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp
index 26cbfd86a21..da687f920d4 100644
--- a/src/server/game/Instances/InstanceScript.cpp
+++ b/src/server/game/Instances/InstanceScript.cpp
@@ -56,7 +56,7 @@ BossBoundaryData::~BossBoundaryData()
DungeonEncounterEntry const* BossInfo::GetDungeonEncounterForDifficulty(Difficulty difficulty) const
{
- auto itr = std::find_if(DungeonEncounters.begin(), DungeonEncounters.end(), [difficulty](DungeonEncounterEntry const* dungeonEncounter)
+ auto itr = std::ranges::find_if(DungeonEncounters, [difficulty](DungeonEncounterEntry const* dungeonEncounter)
{
return dungeonEncounter && (dungeonEncounter->DifficultyID == 0 || Difficulty(dungeonEncounter->DifficultyID) == difficulty);
});
@@ -77,9 +77,7 @@ _entranceId(0), _temporaryEntranceId(0), _combatResurrectionTimer(0), _combatRes
#endif // #ifndef TRINITY_API_USE_DYNAMIC_LINKING
}
-InstanceScript::~InstanceScript()
-{
-}
+InstanceScript::~InstanceScript() = default;
bool InstanceScript::IsEncounterInProgress() const
{
@@ -176,7 +174,7 @@ void InstanceScript::LoadMinionData(MinionData const* data)
while (data->entry)
{
if (data->bossId < bosses.size())
- minions.insert(std::make_pair(data->entry, MinionInfo(&bosses[data->bossId])));
+ minions.try_emplace(data->entry, &bosses[data->bossId]);
++data;
}
@@ -210,8 +208,8 @@ void InstanceScript::LoadObjectData(ObjectData const* data, ObjectInfoMap& objec
{
while (data->entry)
{
- ASSERT(objectInfo.find(data->entry) == objectInfo.end());
- objectInfo[data->entry] = data->type;
+ bool inserted = objectInfo.try_emplace(data->entry, data->type).second;
+ ASSERT(inserted);
++data;
}
}
@@ -219,8 +217,9 @@ void InstanceScript::LoadObjectData(ObjectData const* data, ObjectInfoMap& objec
void InstanceScript::LoadDungeonEncounterData(uint32 bossId, std::array<uint32, MAX_DUNGEON_ENCOUNTERS_PER_BOSS> const& dungeonEncounterIds)
{
if (bossId < bosses.size())
- for (std::size_t i = 0; i < MAX_DUNGEON_ENCOUNTERS_PER_BOSS; ++i)
- bosses[bossId].DungeonEncounters[i] = sDungeonEncounterStore.LookupEntry(dungeonEncounterIds[i]);
+ for (std::size_t i = 0, j = 0; i < MAX_DUNGEON_ENCOUNTERS_PER_BOSS; ++i)
+ if (dungeonEncounterIds[i])
+ bosses[bossId].DungeonEncounters[j++] = sDungeonEncounterStore.AssertEntry(dungeonEncounterIds[i]);
}
void InstanceScript::UpdateDoorState(GameObject* door)
@@ -782,10 +781,9 @@ bool InstanceScript::CheckAchievementCriteriaMeet(uint32 criteria_id, Player con
bool InstanceScript::IsEncounterCompleted(uint32 dungeonEncounterId) const
{
- for (std::size_t i = 0; i < bosses.size(); ++i)
- for (std::size_t j = 0; j < bosses[i].DungeonEncounters.size(); ++j)
- if (bosses[i].DungeonEncounters[j] && bosses[i].DungeonEncounters[j]->ID == dungeonEncounterId)
- return bosses[i].state == DONE;
+ for (BossInfo const& boss : bosses)
+ if (advstd::ranges::contains(boss.DungeonEncounters, dungeonEncounterId, &DungeonEncounterEntry::ID))
+ return boss.state == DONE;
return false;
}
@@ -915,9 +913,16 @@ void InstanceScript::UpdateLfgEncounterState(BossInfo const* bossInfo)
if (grp->isLFGGroup())
{
std::array<uint32, MAX_DUNGEON_ENCOUNTERS_PER_BOSS> dungeonEncounterIds;
- std::ranges::transform(bossInfo->DungeonEncounters, dungeonEncounterIds.begin(),
- [](DungeonEncounterEntry const* entry) { return entry ? entry->ID : 0u; });
- sLFGMgr->OnDungeonEncounterDone(grp->GetGUID(), dungeonEncounterIds, instance);
+ auto itr = dungeonEncounterIds.begin();
+ for (DungeonEncounterEntry const* dungeonEncounter : bossInfo->DungeonEncounters)
+ {
+ if (!dungeonEncounter)
+ break;
+
+ *itr = dungeonEncounter->ID;
+ ++itr;
+ }
+ sLFGMgr->OnDungeonEncounterDone(grp->GetGUID(), std::span(dungeonEncounterIds.begin(), itr), instance);
break;
}
}
diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h
index 228304d8b06..a83413be2c2 100644
--- a/src/server/game/Instances/InstanceScript.h
+++ b/src/server/game/Instances/InstanceScript.h
@@ -132,15 +132,13 @@ typedef std::vector<AreaBoundary const*> CreatureBoundary;
struct BossInfo
{
- BossInfo() : state(TO_BE_DECIDED) { DungeonEncounters.fill(nullptr); }
-
DungeonEncounterEntry const* GetDungeonEncounterForDifficulty(Difficulty difficulty) const;
- EncounterState state;
+ EncounterState state = TO_BE_DECIDED;
std::array<GuidSet, static_cast<uint8>(EncounterDoorBehavior::Max)> door;
GuidSet minion;
CreatureBoundary boundary;
- std::array<DungeonEncounterEntry const*, MAX_DUNGEON_ENCOUNTERS_PER_BOSS> DungeonEncounters;
+ std::array<DungeonEncounterEntry const*, MAX_DUNGEON_ENCOUNTERS_PER_BOSS> DungeonEncounters = { };
};
struct DoorInfo