diff options
author | Ovahlord <dreadkiller@gmx.de> | 2024-05-24 17:13:31 +0200 |
---|---|---|
committer | Ovahlord <dreadkiller@gmx.de> | 2024-05-24 17:13:31 +0200 |
commit | a674f9262b271599fe16723d5a090dec9fb8c361 (patch) | |
tree | 9274b861a4f706da0b871d8fc37db4495311da4f /src | |
parent | 9d6e3e54abf649d1914c41d7d12c59c560671032 (diff) |
Core/Misc: commented out unused parameters and variables in order to fix CI build for the time being until the affected features have been dropped
Diffstat (limited to 'src')
-rw-r--r-- | src/server/game/Achievements/CriteriaHandler.cpp | 1 | ||||
-rw-r--r-- | src/server/game/BattlePets/BattlePetMgr.cpp | 2 | ||||
-rw-r--r-- | src/server/game/DataStores/DB2Stores.cpp | 14 | ||||
-rw-r--r-- | src/server/game/Entities/Item/Item.cpp | 12 | ||||
-rw-r--r-- | src/server/game/Entities/Item/ItemBonusMgr.cpp | 10 | ||||
-rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 2 | ||||
-rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 2 | ||||
-rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 1 | ||||
-rw-r--r-- | src/server/game/Miscellaneous/Formulas.h | 2 | ||||
-rw-r--r-- | src/server/game/Spells/Auras/SpellAuraEffects.cpp | 10 | ||||
-rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 2 |
11 files changed, 24 insertions, 34 deletions
diff --git a/src/server/game/Achievements/CriteriaHandler.cpp b/src/server/game/Achievements/CriteriaHandler.cpp index bf5988b1ce0..3370c29eb9a 100644 --- a/src/server/game/Achievements/CriteriaHandler.cpp +++ b/src/server/game/Achievements/CriteriaHandler.cpp @@ -1685,7 +1685,6 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 { uint32 reqValue = modifier->Asset; uint32 secondaryAsset = modifier->SecondaryAsset; - int32 tertiaryAsset = modifier->TertiaryAsset; switch (ModifierTreeType(modifier->Type)) { diff --git a/src/server/game/BattlePets/BattlePetMgr.cpp b/src/server/game/BattlePets/BattlePetMgr.cpp index 52729affb5a..d485c097609 100644 --- a/src/server/game/BattlePets/BattlePetMgr.cpp +++ b/src/server/game/BattlePets/BattlePetMgr.cpp @@ -697,7 +697,7 @@ void BattlePetMgr::ChangeBattlePetQuality(ObjectGuid guid, BattlePetBreedQuality // _owner->GetPlayer()->SetCurrentBattlePetBreedQuality(qualityValue); } -void BattlePetMgr::GrantBattlePetExperience(ObjectGuid guid, uint16 xp, BattlePetXpSource xpSource) +void BattlePetMgr::GrantBattlePetExperience(ObjectGuid /*guid*/, uint16 /*xp*/, BattlePetXpSource /*xpSource*/) { return; diff --git a/src/server/game/DataStores/DB2Stores.cpp b/src/server/game/DataStores/DB2Stores.cpp index fb19e931d29..fcfae9247ce 100644 --- a/src/server/game/DataStores/DB2Stores.cpp +++ b/src/server/game/DataStores/DB2Stores.cpp @@ -1866,7 +1866,7 @@ bool DB2Manager::IsInArea(uint32 objectAreaId, uint32 areaId) return false; } -ContentTuningEntry const* DB2Manager::GetContentTuningForArea(AreaTableEntry const* areaEntry) +ContentTuningEntry const* DB2Manager::GetContentTuningForArea(AreaTableEntry const* /*areaEntry*/) { return nullptr; } @@ -1955,7 +1955,7 @@ char const* DB2Manager::GetBroadcastTextValue(BroadcastTextEntry const* broadcas return broadcastText->Text[DEFAULT_LOCALE]; } -int32 const* DB2Manager::GetBroadcastTextDuration(int32 broadcastTextId, LocaleConstant locale /*= DEFAULT_LOCALE*/) const +int32 const* DB2Manager::GetBroadcastTextDuration(int32 /*broadcastTextId*/, LocaleConstant /*locale*/ /*= DEFAULT_LOCALE*/) const { return nullptr; } @@ -2039,12 +2039,12 @@ uint32 DB2Manager::GetRedirectedContentTuningId(uint32 contentTuningId, uint32 r return contentTuningId; } -Optional<ContentTuningLevels> DB2Manager::GetContentTuningData(uint32 contentTuningId, uint32 redirectFlag, bool forItem /*= false*/) const +Optional<ContentTuningLevels> DB2Manager::GetContentTuningData(uint32 /*contentTuningId*/, uint32 /*redirectFlag*/, bool /*forItem*/ /*= false*/) const { return {}; } -bool DB2Manager::HasContentTuningLabel(uint32 contentTuningId, int32 label) const +bool DB2Manager::HasContentTuningLabel(uint32 /*contentTuningId*/, int32 /*label*/) const { return false; } @@ -2239,7 +2239,7 @@ EmotesTextSoundEntry const* DB2Manager::GetTextSoundEmoteFor(uint32 emote, uint8 return nullptr; } -float DB2Manager::EvaluateExpectedStat(ExpectedStatType stat, uint32 level, int32 expansion, uint32 contentTuningId, Classes unitClass, int32 mythicPlusMilestoneSeason) const +float DB2Manager::EvaluateExpectedStat(ExpectedStatType /*stat*/, uint32 /*level*/, int32 /*expansion*/, uint32 /*contentTuningId*/, Classes /*unitClass*/, int32 /*mythicPlusMilestoneSeason*/) const { return 1.0f; } @@ -2254,7 +2254,7 @@ DB2Manager::FriendshipRepReactionSet const* DB2Manager::GetFriendshipRepReaction return Trinity::Containers::MapGetValuePtr(_friendshipRepReactions, friendshipRepID); } -uint32 DB2Manager::GetGlobalCurveId(GlobalCurve globalCurveType) const +uint32 DB2Manager::GetGlobalCurveId(GlobalCurve /*globalCurveType*/) const { return 0; } @@ -3120,7 +3120,7 @@ WMOAreaTableEntry const* DB2Manager::GetWMOAreaTable(int32 rootId, int32 adtId, return Trinity::Containers::MapGetValuePtr(_wmoAreaTableLookup, WMOAreaTableKey(int16(rootId), int8(adtId), groupId)); } -std::unordered_set<uint32> const* DB2Manager::GetPVPStatIDsForMap(uint32 mapId) const +std::unordered_set<uint32> const* DB2Manager::GetPVPStatIDsForMap(uint32 /*mapId*/) const { return nullptr; } diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index 42e16152695..ba5a0d7691a 100644 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -923,11 +923,11 @@ void Item::LoadArtifactData(Player const* owner, uint64 xp, uint32 artifactAppea switch (enchant->Effect[i]) { case ITEM_ENCHANTMENT_TYPE_ARTIFACT_POWER_BONUS_RANK_BY_TYPE: - if (uint32(artifactPower->Label) == enchant->EffectArg[i]) + if (artifactPower->Label == enchant->EffectArg[i]) power.CurrentRankWithBonus += enchant->EffectPointsMin[i]; break; case ITEM_ENCHANTMENT_TYPE_ARTIFACT_POWER_BONUS_RANK_BY_ID: - if (artifactPower->ID == enchant->EffectArg[i]) + if (int32(artifactPower->ID) == enchant->EffectArg[i]) power.CurrentRankWithBonus += enchant->EffectPointsMin[i]; break; case ITEM_ENCHANTMENT_TYPE_ARTIFACT_POWER_BONUS_RANK_PICKER: @@ -1235,7 +1235,7 @@ bool Item::HasEnchantRequiredSkill(Player const* player) const uint32 Item::GetEnchantRequiredLevel() const { - uint32 level = 0; + int32 level = 0; // Check all enchants for required level for (uint32 enchant_slot = PERM_ENCHANTMENT_SLOT; enchant_slot < MAX_ENCHANTMENT_SLOT; ++enchant_slot) @@ -1244,7 +1244,7 @@ uint32 Item::GetEnchantRequiredLevel() const if (enchantEntry->MinLevel > level) level = enchantEntry->MinLevel; - return level; + return static_cast<uint32>(level); } bool Item::IsBoundByEnchant() const @@ -2520,7 +2520,7 @@ uint32 Item::GetTotalUnlockedArtifactPowers() const { uint32 purchased = GetTotalPurchasedArtifactPowers(); uint64 artifactXp = m_itemData->ArtifactXP; - uint32 currentArtifactTier = GetModifier(ITEM_MODIFIER_ARTIFACT_TIER); + //uint32 currentArtifactTier = GetModifier(ITEM_MODIFIER_ARTIFACT_TIER); uint32 extraUnlocked = 0; do { @@ -2560,7 +2560,7 @@ void Item::ApplyArtifactPowerEnchantmentBonuses(EnchantmentSlot slot, uint32 enc for (uint32 artifactPowerIndex = 0; artifactPowerIndex < m_itemData->ArtifactPowers.size(); ++artifactPowerIndex) { UF::ArtifactPower const& artifactPower = m_itemData->ArtifactPowers[artifactPowerIndex]; - if (uint32(sArtifactPowerStore.AssertEntry(artifactPower.ArtifactPowerID)->Label) == enchant->EffectArg[i]) + if (sArtifactPowerStore.AssertEntry(artifactPower.ArtifactPowerID)->Label == enchant->EffectArg[i]) { uint8 newRank = artifactPower.CurrentRankWithBonus; if (apply) diff --git a/src/server/game/Entities/Item/ItemBonusMgr.cpp b/src/server/game/Entities/Item/ItemBonusMgr.cpp index 7d743604455..80864280f46 100644 --- a/src/server/game/Entities/Item/ItemBonusMgr.cpp +++ b/src/server/game/Entities/Item/ItemBonusMgr.cpp @@ -81,8 +81,6 @@ ItemContext GetContextForPlayer(MapDifficultyEntry const* mapDifficulty, Player if (mapDifficulty->ItemContextPickerID) { - uint32 contentTuningId = sDB2Manager.GetRedirectedContentTuningId(mapDifficulty->ContentTuningID, 0 /*player->m_playerData->CtrOptions->ContentTuningConditionMask*/); - ItemContextPickerEntryEntry const* selectedPickerEntry = nullptr; for (ItemContextPickerEntryEntry const* itemContextPickerEntry : sItemContextPickerEntryStore) { @@ -129,21 +127,21 @@ uint32 GetItemBonusListForItemLevelDelta(int16 delta) return 0; } -bool CanApplyBonusTreeToItem(ItemTemplate const* itemTemplate, uint32 itemBonusTreeId, ItemBonusGenerationParams const& params) +bool CanApplyBonusTreeToItem(ItemTemplate const* /*itemTemplate*/, uint32 /*itemBonusTreeId*/, ItemBonusGenerationParams const& /*params*/) { return false; } -uint32 GetBonusTreeIdOverride(uint32 itemBonusTreeId, ItemBonusGenerationParams const& params) +uint32 GetBonusTreeIdOverride(uint32 itemBonusTreeId, ItemBonusGenerationParams const& /*params*/) { return itemBonusTreeId; } -void ApplyBonusTreeHelper(ItemTemplate const* itemTemplate, uint32 itemBonusTreeId, ItemBonusGenerationParams const& params, int32 sequenceLevel, uint32* itemLevelSelectorId, std::vector<int32>* bonusListIDs) +void ApplyBonusTreeHelper(ItemTemplate const* /*itemTemplate*/, uint32 /*itemBonusTreeId*/, ItemBonusGenerationParams const& /*params*/, int32 /*sequenceLevel*/, uint32* /*itemLevelSelectorId*/, std::vector<int32>* /*bonusListIDs*/) { } -int32 GetAzeriteUnlockBonusList(uint16 azeriteUnlockMappingSetId, uint16 minItemLevel, InventoryType inventoryType) +int32 GetAzeriteUnlockBonusList(uint16 /*azeriteUnlockMappingSetId*/, uint16 /*minItemLevel*/, InventoryType /*inventoryType*/) { return 0; } diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index d470fd202b3..c55f6ebad4a 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -26463,7 +26463,7 @@ void Player::ResetTalentSpecialization() */ } -TalentLearnResult Player::LearnPvpTalent(uint32 talentID, uint8 slot, int32* spellOnCooldown) +TalentLearnResult Player::LearnPvpTalent(uint32 /*talentID*/, uint8 /*slot*/, int32* /*spellOnCooldown*/) { return TALENT_FAILED_UNKNOWN; } diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index f9b72f89a43..7d8953a6eb3 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -9234,7 +9234,7 @@ void Unit::UpdateResistances(uint32 school) UpdateArmor(); } -float Unit::GetTotalAttackPowerValue(WeaponAttackType attType, bool includeWeapon /*= true*/) const +float Unit::GetTotalAttackPowerValue(WeaponAttackType attType, bool /*includeWeapon*/ /*= true*/) const { if (attType == RANGED_ATTACK) { diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index aec596871b8..4f362344856 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -6904,7 +6904,6 @@ WorldSafeLocsEntry const* ObjectMgr::GetClosestGraveyardInZone(WorldLocation con // at entrance map for corpse map bool foundEntr = false; - float distEntr = 10000; WorldSafeLocsEntry const* entryEntr = nullptr; // some where other diff --git a/src/server/game/Miscellaneous/Formulas.h b/src/server/game/Miscellaneous/Formulas.h index 5cde7ae1a95..b98b5fc5ada 100644 --- a/src/server/game/Miscellaneous/Formulas.h +++ b/src/server/game/Miscellaneous/Formulas.h @@ -136,7 +136,7 @@ namespace Trinity return diff; } - inline uint32 BaseGain(uint8 pl_level, uint8 mob_level) + inline uint32 BaseGain(uint8 /*pl_level*/, uint8 /*mob_level*/) { return 0; diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 132fa616809..e77ca02b0db 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -4097,7 +4097,7 @@ void AuraEffect::HandleAuraModIncreaseBaseManaPercent(AuraApplication const* aur } } -void AuraEffect::HandleModManaCostPct(AuraApplication const* aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModManaCostPct(AuraApplication const* /*aurApp*/, uint8 mode, bool /*apply*/) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) return; @@ -4646,7 +4646,7 @@ void AuraEffect::HandleShieldBlockValuePercent(AuraApplication const* aurApp, ui /*** POWER COST ***/ /********************************/ -void AuraEffect::HandleModPowerCost(AuraApplication const* aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModPowerCost(AuraApplication const* /*aurApp*/, uint8 mode, bool /*apply*/) const { if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK)) return; @@ -4654,12 +4654,6 @@ void AuraEffect::HandleModPowerCost(AuraApplication const* aurApp, uint8 mode, b // handled in SpellInfo::CalcPowerCost, this is only for client UI if (!(GetMiscValueB() & (1 << POWER_MANA))) return; - - // Unit* target = aurApp->GetTarget(); - // - // for (int i = 0; i < MAX_SPELL_SCHOOL; ++i) - // if (GetMiscValue() & (1 << i)) - // target->ApplyModManaCostModifier(SpellSchools(i), GetAmount(), apply); } void AuraEffect::HandleArenaPreparation(AuraApplication const* aurApp, uint8 mode, bool apply) const diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 4cc681a03fb..2655ac510c4 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -550,7 +550,7 @@ int32 SpellEffectInfo::CalcValue(WorldObject const* caster /*= nullptr*/, int32 return int32(round(value)); } -int32 SpellEffectInfo::CalcBaseValue(WorldObject const* caster, Unit const* target, uint32 itemId, int32 itemLevel) const +int32 SpellEffectInfo::CalcBaseValue(WorldObject const* caster, Unit const* target, uint32 /*itemId*/, int32 /*itemLevel*/) const { if (Scaling.Coefficient != 0.0f) { |