diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2018-01-18 00:53:45 -0300 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-06-16 01:29:25 +0200 |
| commit | 3bc3b3eeeb78fa8acc559730f9c45b0f237e4b2b (patch) | |
| tree | d2a69894d0f57fded858481a0d93c611aa6a6a7c /src/server/game/Globals/ObjectMgr.h | |
| parent | 21556667c16b282b77934bddee3d86f0c632ef31 (diff) | |
Core/Globals: revert back to unordered_map for templates
Partial revert of commit b64c5043140dc7b7908e259e441de16cc0261320
See discussion on https://github.com/TrinityCore/TrinityCore/commit/b64c5043140dc7b7908e259e441de16cc0261320
(cherry picked from commit b75ff7d4bf13fb4778843c99521223becc096ca0)
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.h')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index f2911b515de..abd56dd76b1 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -170,7 +170,7 @@ struct GameTele std::wstring wnameLow; }; -typedef std::unordered_map<uint32, GameTele > GameTeleContainer; +typedef std::unordered_map<uint32, GameTele> GameTeleContainer; enum ScriptsType { @@ -417,7 +417,7 @@ struct ScriptInfo }; typedef std::multimap<uint32, ScriptInfo> ScriptMap; -typedef std::map<uint32, ScriptMap > ScriptMapMap; +typedef std::map<uint32, ScriptMap> ScriptMapMap; typedef std::multimap<uint32 /*spell id*/, std::pair<uint32 /*script id*/, bool /*enabled*/>> SpellScriptsContainer; typedef std::pair<SpellScriptsContainer::iterator, SpellScriptsContainer::iterator> SpellScriptsBounds; TC_GAME_API extern ScriptMapMap sSpellScripts; @@ -495,7 +495,7 @@ struct TrinityString }; typedef std::map<ObjectGuid, ObjectGuid> LinkedRespawnContainer; -typedef std::vector<std::unique_ptr<CreatureTemplate>> CreatureTemplateContainer; +typedef std::unordered_map<uint32, CreatureTemplate> CreatureTemplateContainer; typedef std::unordered_map<uint32, CreatureAddon> CreatureTemplateAddonContainer; typedef std::unordered_map<ObjectGuid::LowType, CreatureData> CreatureDataContainer; typedef std::unordered_map<ObjectGuid::LowType, CreatureAddon> CreatureAddonContainer; @@ -504,7 +504,7 @@ typedef std::unordered_map<uint8, EquipmentInfo> EquipmentInfoContainerInternal; typedef std::unordered_map<uint32, EquipmentInfoContainerInternal> EquipmentInfoContainer; typedef std::unordered_map<uint32, CreatureModelInfo> CreatureModelContainer; typedef std::unordered_map<uint32, std::vector<uint32>> CreatureQuestItemMap; -typedef std::vector<std::unique_ptr<GameObjectTemplate>> GameObjectTemplateContainer; +typedef std::unordered_map<uint32, GameObjectTemplate> GameObjectTemplateContainer; typedef std::unordered_map<uint32, GameObjectTemplateAddon> GameObjectTemplateAddonContainer; typedef std::unordered_map<ObjectGuid::LowType, GameObjectData> GameObjectDataContainer; typedef std::unordered_map<ObjectGuid::LowType, GameObjectAddon> GameObjectAddonContainer; @@ -515,7 +515,7 @@ typedef std::unordered_map<uint16, std::vector<InstanceSpawnGroupInfo>> Instance typedef std::map<TempSummonGroupKey, std::vector<TempSummonData>> TempSummonDataContainer; typedef std::unordered_map<uint32, CreatureLocale> CreatureLocaleContainer; typedef std::unordered_map<uint32, GameObjectLocale> GameObjectLocaleContainer; -typedef std::vector<std::unique_ptr<ItemTemplate>> ItemTemplateContainer; +typedef std::unordered_map<uint32, ItemTemplate> ItemTemplateContainer; typedef std::unordered_map<uint32, QuestTemplateLocale> QuestTemplateLocaleContainer; typedef std::unordered_map<uint32, QuestObjectivesLocale> QuestObjectivesLocaleContainer; typedef std::unordered_map<uint32, QuestOfferRewardLocale> QuestOfferRewardLocaleContainer; @@ -935,7 +935,7 @@ struct DungeonEncounter uint32 lastEncounterDungeon; }; -typedef std::vector<std::unique_ptr<DungeonEncounter const>> DungeonEncounterList; +typedef std::vector<DungeonEncounter> DungeonEncounterList; typedef std::unordered_map<uint64, DungeonEncounterList> DungeonEncounterContainer; struct TerrainSwapInfo @@ -1010,14 +1010,14 @@ class TC_GAME_API ObjectMgr static ObjectMgr* instance(); - typedef std::vector<std::unique_ptr<Quest>> QuestContainer; + typedef std::unordered_map<uint32, Quest> QuestContainer; typedef std::unordered_map<uint32 /*questObjectiveId*/, QuestObjective const*> QuestObjectivesByIdContainer; typedef std::unordered_map<uint32, AreaTriggerStruct> AreaTriggerContainer; typedef std::unordered_map<uint32, uint32> AreaTriggerScriptContainer; - typedef std::unordered_map<uint64, std::unique_ptr<AccessRequirement>> AccessRequirementContainer; + typedef std::unordered_map<uint64, AccessRequirement> AccessRequirementContainer; typedef std::unordered_map<uint32, RepRewardRate > RepRewardRateContainer; typedef std::unordered_map<uint32, ReputationOnKillEntry> RepOnKillContainer; @@ -1031,7 +1031,7 @@ class TC_GAME_API ObjectMgr GameObjectTemplate const* GetGameObjectTemplate(uint32 entry) const; GameObjectTemplateContainer const& GetGameObjectTemplates() const { return _gameObjectTemplateStore; } - uint32 LoadReferenceVendor(int32 vendor, int32 item_id, std::set<uint32> *skip_vendors); + uint32 LoadReferenceVendor(int32 vendor, int32 item_id, std::set<uint32>* skip_vendors); void LoadGameObjectTemplate(); void LoadGameObjectTemplateAddons(); @@ -1170,7 +1170,7 @@ class TC_GAME_API ObjectMgr return nullptr; } - QuestPOIData const* GetQuestPOIData(int32 QuestID); + QuestPOIData const* GetQuestPOIData(int32 questId); VehicleTemplate const* GetVehicleTemplate(Vehicle* veh) const; VehicleAccessoryList const* GetVehicleAccessoryList(Vehicle* veh) const; |
