aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Globals/ObjectMgr.h
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2023-01-07 22:38:21 +0100
committerShauren <shauren.trinity@gmail.com>2023-01-07 22:38:21 +0100
commit92ed5e8af1f8b1aac085fd9b0ea93afb2b6795d4 (patch)
treef141fe0afd8ff11a7037329ffd75f070d73d6e70 /src/server/game/Globals/ObjectMgr.h
parenta53e4a57565d3375a978effbbc32d3eed6aac7e3 (diff)
Core/Misc: Include cleanup, 2023 edition
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.h')
-rw-r--r--src/server/game/Globals/ObjectMgr.h16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index fe5cb6877c5..c7e205bba3a 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -1448,11 +1448,11 @@ class TC_GAME_API ObjectMgr
void SetHighestGuids();
template<HighGuid type>
- inline ObjectGuidGeneratorBase& GetGenerator()
+ ObjectGuidGenerator& GetGenerator()
{
static_assert(ObjectGuidTraits<type>::SequenceSource.HasFlag(ObjectGuidSequenceSource::Global | ObjectGuidSequenceSource::Realm),
"Only global guid can be generated in ObjectMgr context");
- return GetGuidSequenceGenerator<type>();
+ return GetGuidSequenceGenerator(type);
}
uint32 GenerateAuctionID();
@@ -1801,17 +1801,9 @@ class TC_GAME_API ObjectMgr
uint64 _voidItemId;
// first free low guid for selected guid type
- template<HighGuid high>
- inline ObjectGuidGeneratorBase& GetGuidSequenceGenerator()
- {
- auto itr = _guidGenerators.find(high);
- if (itr == _guidGenerators.end())
- itr = _guidGenerators.insert(std::make_pair(high, std::make_unique<ObjectGuidGenerator<high>>())).first;
-
- return *itr->second;
- }
+ ObjectGuidGenerator& GetGuidSequenceGenerator(HighGuid high);
- std::map<HighGuid, std::unique_ptr<ObjectGuidGeneratorBase>> _guidGenerators;
+ std::map<HighGuid, std::unique_ptr<ObjectGuidGenerator>> _guidGenerators;
QuestContainer _questTemplates;
std::vector<Quest const*> _questTemplatesAutoPush;
QuestObjectivesByIdContainer _questObjectives;