From 13f22e0c06fcce0d76fba3530eff9a1c06c72674 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 28 Sep 2025 00:06:28 +0200 Subject: Core/Misc: Reduce differences between branches --- src/server/game/Loot/LootMgr.cpp | 9 ++------- src/server/game/Loot/LootMgr.h | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'src/server/game/Loot') diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp index 5c8999b99e7..650c7190c92 100644 --- a/src/server/game/Loot/LootMgr.cpp +++ b/src/server/game/Loot/LootMgr.cpp @@ -236,11 +236,6 @@ void LootStore::ReportUnusedIds(LootIdSet const& lootIdSet) const TC_LOG_ERROR("sql.sql", "Table '{}' Entry {} isn't {} and not referenced from loot, and thus useless.", GetName(), lootId, GetEntryName()); } -void LootStore::ReportNonExistingId(uint32 lootId) const -{ - TC_LOG_ERROR("sql.sql", "Table '{}' Entry {} does not exist", GetName(), lootId); -} - void LootStore::ReportNonExistingId(uint32 lootId, char const* ownerType, uint32 ownerId) const { TC_LOG_ERROR("sql.sql", "Table '{}' Entry {} does not exist but it is used by {} {}", GetName(), lootId, ownerType, ownerId); @@ -1127,7 +1122,7 @@ void LoadLootTemplates_Disenchant() { uint32 lootid = disenchant->ID; if (!lootIdSet.contains(lootid)) - LootTemplates_Disenchant.ReportNonExistingId(lootid); + LootTemplates_Disenchant.ReportNonExistingId(lootid, "ItemDisenchantLoot", lootid); else lootIdSetUsed.insert(lootid); } @@ -1139,7 +1134,7 @@ void LoadLootTemplates_Disenchant() uint32 lootid = itemBonus->Value[0]; if (!lootIdSet.contains(lootid)) - LootTemplates_Disenchant.ReportNonExistingId(lootid); + LootTemplates_Disenchant.ReportNonExistingId(lootid, "ItemBonusList", itemBonus->ParentItemBonusListID); else lootIdSetUsed.insert(lootid); } diff --git a/src/server/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h index 808cf529201..8d9ed8df8f0 100644 --- a/src/server/game/Loot/LootMgr.h +++ b/src/server/game/Loot/LootMgr.h @@ -87,7 +87,6 @@ class TC_GAME_API LootStore uint32 LoadAndCollectLootIds(LootIdSet& lootIdSet); void CheckLootRefs(LootIdSet* ref_set = nullptr) const; // check existence reference and remove it from ref_set void ReportUnusedIds(LootIdSet const& lootIdSet) const; - void ReportNonExistingId(uint32 lootId) const; void ReportNonExistingId(uint32 lootId, char const* ownerType, uint32 ownerId) const; bool HaveLootFor(uint32 loot_id) const { return m_LootTemplates.contains(loot_id); } -- cgit v1.2.3