diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/DataStores/DB2Stores.cpp | 118 |
1 files changed, 22 insertions, 96 deletions
diff --git a/src/server/game/DataStores/DB2Stores.cpp b/src/server/game/DataStores/DB2Stores.cpp index 602bc2a1718..f0400732fde 100644 --- a/src/server/game/DataStores/DB2Stores.cpp +++ b/src/server/game/DataStores/DB2Stores.cpp @@ -1715,20 +1715,12 @@ std::vector<ArtifactPowerEntry const*> DB2Manager::GetArtifactPowers(uint8 artif std::unordered_set<uint32> const* DB2Manager::GetArtifactPowerLinks(uint32 artifactPowerId) const { - auto itr = _artifactPowerLinks.find(artifactPowerId); - if (itr != _artifactPowerLinks.end()) - return &itr->second; - - return nullptr; + return Trinity::Containers::MapGetValuePtr(_artifactPowerLinks, artifactPowerId); } ArtifactPowerRankEntry const* DB2Manager::GetArtifactPowerRank(uint32 artifactPowerId, uint8 rank) const { - auto itr = _artifactPowerRanks.find({ artifactPowerId, rank }); - if (itr != _artifactPowerRanks.end()) - return itr->second; - - return nullptr; + return Trinity::Containers::MapGetValuePtr(_artifactPowerRanks, { artifactPowerId, rank }); } AzeriteEmpoweredItemEntry const* DB2Manager::GetAzeriteEmpoweredItem(uint32 itemId) const @@ -2072,13 +2064,11 @@ float DB2Manager::GetCurveValueAt(uint32 curveId, float x) const EmotesTextSoundEntry const* DB2Manager::GetTextSoundEmoteFor(uint32 emote, uint8 race, uint8 gender, uint8 class_) const { - auto itr = _emoteTextSounds.find(EmotesTextSoundContainer::key_type(emote, race, gender, class_)); - if (itr != _emoteTextSounds.end()) - return itr->second; + if (EmotesTextSoundEntry const* emotesTextSound = Trinity::Containers::MapGetValuePtr(_emoteTextSounds, { emote, race, gender, class_ })) + return emotesTextSound; - itr = _emoteTextSounds.find(EmotesTextSoundContainer::key_type(emote, race, gender, uint8(0))); - if (itr != _emoteTextSounds.end()) - return itr->second; + if (EmotesTextSoundEntry const* emotesTextSound = Trinity::Containers::MapGetValuePtr(_emoteTextSounds, { emote, race, gender, uint8(0) })) + return emotesTextSound; return nullptr; } @@ -2198,47 +2188,27 @@ float DB2Manager::EvaluateExpectedStat(ExpectedStatType stat, uint32 level, int3 std::vector<uint32> const* DB2Manager::GetFactionTeamList(uint32 faction) const { - auto itr = _factionTeams.find(faction); - if (itr != _factionTeams.end()) - return &itr->second; - - return nullptr; + return Trinity::Containers::MapGetValuePtr(_factionTeams, faction); } HeirloomEntry const* DB2Manager::GetHeirloomByItemId(uint32 itemId) const { - auto itr = _heirlooms.find(itemId); - if (itr != _heirlooms.end()) - return itr->second; - - return nullptr; + return Trinity::Containers::MapGetValuePtr(_heirlooms, itemId); } std::vector<uint32> const* DB2Manager::GetGlyphBindableSpells(uint32 glyphPropertiesId) const { - auto itr = _glyphBindableSpells.find(glyphPropertiesId); - if (itr != _glyphBindableSpells.end()) - return &itr->second; - - return nullptr; + return Trinity::Containers::MapGetValuePtr(_glyphBindableSpells, glyphPropertiesId); } std::vector<uint32> const* DB2Manager::GetGlyphRequiredSpecs(uint32 glyphPropertiesId) const { - auto itr = _glyphRequiredSpecs.find(glyphPropertiesId); - if (itr != _glyphRequiredSpecs.end()) - return &itr->second; - - return nullptr; + return Trinity::Containers::MapGetValuePtr(_glyphRequiredSpecs, glyphPropertiesId); } DB2Manager::ItemBonusList const* DB2Manager::GetItemBonusList(uint32 bonusListId) const { - auto itr = _itemBonusLists.find(bonusListId); - if (itr != _itemBonusLists.end()) - return &itr->second; - - return nullptr; + return Trinity::Containers::MapGetValuePtr(_itemBonusLists, bonusListId); } uint32 DB2Manager::GetItemBonusListForItemLevelDelta(int16 delta) const @@ -2392,11 +2362,7 @@ void LoadAzeriteEmpoweredItemUnlockMappings(std::unordered_map<int32, std::vecto ItemChildEquipmentEntry const* DB2Manager::GetItemChildEquipment(uint32 itemId) const { - auto itr = _itemChildEquipment.find(itemId); - if (itr != _itemChildEquipment.end()) - return itr->second; - - return nullptr; + return Trinity::Containers::MapGetValuePtr(_itemChildEquipment, itemId); } ItemClassEntry const* DB2Manager::GetItemClassByOldEnum(uint32 itemClass) const @@ -2411,11 +2377,7 @@ bool DB2Manager::HasItemCurrencyCost(uint32 itemId) const std::vector<ItemLimitCategoryConditionEntry const*> const* DB2Manager::GetItemLimitCategoryConditions(uint32 categoryId) const { - auto itr = _itemCategoryConditions.find(categoryId); - if (itr != _itemCategoryConditions.end()) - return &itr->second; - - return nullptr; + return Trinity::Containers::MapGetValuePtr(_itemCategoryConditions, categoryId); } uint32 DB2Manager::GetItemDisplayId(uint32 itemId, uint32 appearanceModId) const @@ -2446,29 +2408,17 @@ ItemModifiedAppearanceEntry const* DB2Manager::GetItemModifiedAppearance(uint32 ItemModifiedAppearanceEntry const* DB2Manager::GetDefaultItemModifiedAppearance(uint32 itemId) const { - auto itr = _itemModifiedAppearancesByItem.find(itemId); - if (itr != _itemModifiedAppearancesByItem.end()) - return itr->second; - - return nullptr; + return Trinity::Containers::MapGetValuePtr(_itemModifiedAppearancesByItem, itemId); } std::vector<ItemSetSpellEntry const*> const* DB2Manager::GetItemSetSpells(uint32 itemSetId) const { - auto itr = _itemSetSpells.find(itemSetId); - if (itr != _itemSetSpells.end()) - return &itr->second; - - return nullptr; + return Trinity::Containers::MapGetValuePtr(_itemSetSpells, itemSetId); } std::vector<ItemSpecOverrideEntry const*> const* DB2Manager::GetItemSpecOverrides(uint32 itemId) const { - auto itr = _itemSpecOverrides.find(itemId); - if (itr != _itemSpecOverrides.end()) - return &itr->second; - - return nullptr; + return Trinity::Containers::MapGetValuePtr(_itemSpecOverrides, itemId); } LFGDungeonsEntry const* DB2Manager::GetLfgDungeon(uint32 mapId, Difficulty difficulty) @@ -2581,11 +2531,7 @@ DB2Manager::MapDifficultyConditionsContainer const* DB2Manager::GetMapDifficulty MountEntry const* DB2Manager::GetMount(uint32 spellId) const { - auto itr = _mountsBySpellId.find(spellId); - if (itr != _mountsBySpellId.end()) - return itr->second; - - return nullptr; + return Trinity::Containers::MapGetValuePtr(_mountsBySpellId, spellId); } MountEntry const* DB2Manager::GetMountById(uint32 id) const @@ -2595,11 +2541,7 @@ MountEntry const* DB2Manager::GetMountById(uint32 id) const DB2Manager::MountTypeXCapabilitySet const* DB2Manager::GetMountCapabilities(uint32 mountType) const { - auto itr = _mountCapabilitiesByType.find(mountType); - if (itr != _mountCapabilitiesByType.end()) - return &itr->second; - - return nullptr; + return Trinity::Containers::MapGetValuePtr(_mountCapabilitiesByType, mountType); } DB2Manager::MountXDisplayContainer const* DB2Manager::GetMountDisplays(uint32 mountId) const @@ -2745,11 +2687,7 @@ uint32 DB2Manager::GetQuestUniqueBitFlag(uint32 questId) std::vector<uint32> const* DB2Manager::GetPhasesForGroup(uint32 group) const { - auto itr = _phasesByGroup.find(group); - if (itr != _phasesByGroup.end()) - return &itr->second; - - return nullptr; + return Trinity::Containers::MapGetValuePtr(_phasesByGroup, group); } PowerTypeEntry const* DB2Manager::GetPowerTypeEntry(Powers power) const @@ -2786,20 +2724,12 @@ uint8 DB2Manager::GetPvpItemLevelBonus(uint32 itemId) const std::vector<RewardPackXCurrencyTypeEntry const*> const* DB2Manager::GetRewardPackCurrencyTypesByRewardID(uint32 rewardPackID) const { - auto itr = _rewardPackCurrencyTypes.find(rewardPackID); - if (itr != _rewardPackCurrencyTypes.end()) - return &itr->second; - - return nullptr; + return Trinity::Containers::MapGetValuePtr(_rewardPackCurrencyTypes, rewardPackID); } std::vector<RewardPackXItemEntry const*> const* DB2Manager::GetRewardPackItemsByRewardID(uint32 rewardPackID) const { - auto itr = _rewardPackItems.find(rewardPackID); - if (itr != _rewardPackItems.end()) - return &itr->second; - - return nullptr; + return Trinity::Containers::MapGetValuePtr(_rewardPackItems, rewardPackID); } ShapeshiftFormModelData const* DB2Manager::GetShapeshiftFormModelData(uint8 race, uint8 gender, uint8 form) const @@ -2835,11 +2765,7 @@ SkillRaceClassInfoEntry const* DB2Manager::GetSkillRaceClassInfo(uint32 skill, u std::vector<SpecializationSpellsEntry const*> const* DB2Manager::GetSpecializationSpells(uint32 specId) const { - auto itr = _specializationSpellsBySpec.find(specId); - if (itr != _specializationSpellsBySpec.end()) - return &itr->second; - - return nullptr; + return Trinity::Containers::MapGetValuePtr(_specializationSpellsBySpec, specId); } bool DB2Manager::IsSpecSetMember(int32 specSetId, uint32 specId) const |